- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Do not report unsafe migration for local files
by Jiri Denemark 12 Apr '13

12 Apr '13

When migrating a domain with disk images stored locally (and using storage migration), we should not complain about unsafe migration no matter what cache policy is used for that disk. --- src/qemu/qemu_migration.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a263668..a31bd02 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1477,13 +1477,17 @@ qemuMigrationIsSafe(virDomainDefPtr def) !disk->shared && !disk->readonly && disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE) { - int cfs; + int rc; if (disk->type == VIR_DOMAIN_DISK_TYPE_FILE) { - if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1) + if ((rc = virStorageFileIsSharedFS(disk->src)) < 0) + return false; + else if (rc == 0) continue; - else if (cfs < 0) + if ((rc = virStorageFileIsClusterFS(disk->src)) < 0) return false; + else if (rc == 1) + continue; } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { continue; -- 1.8.1.5

2 2

[libvirt] [PATCH] virsh: Document that using incomplete XML files may have unexpected results
by Peter Krempa 11 Apr '13

11 Apr '13

Explicitly state that using incomplete XML definition snippets for hot-management commands may have unexpected results due to autogenerating values for some of the fields if they aren't specified explicitly. --- tools/virsh.pod | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1510d0d..11984bc 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1824,6 +1824,10 @@ within an existing device; consider using B<update-device> for this usage. For passthrough host devices, see also B<nodedev-detach>, needed if the device does not use managed mode. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + =item B<attach-disk> I<domain> I<source> I<target> [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] @@ -1893,6 +1897,10 @@ as command B<attach-device>. For passthrough host devices, see also B<nodedev-reattach>, needed if the device does not use managed mode. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. If I<--current> is specified, affect the current domain state. @@ -1969,6 +1977,10 @@ an offline domain, and like I<--live> I<--config> for a running domain. Note that older versions of virsh used I<--config> as an alias for I<--persistent>. +B<Note>: using of partial device definition XML files may lead to unexpected +results as some fields may be autogenerated and thus match devices other than +expected. + =item B<change-media> I<domain> I<path> [I<--eject>] [I<--insert>] [I<--update>] [I<source>] [I<--force>] [[I<--live>] [I<--config>] | [I<--current>]] -- 1.8.1.5

2 2

[libvirt] [PATCHv2] qemu: Try to use QMP for send-key if supported
by Peter Krempa 11 Apr '13

11 Apr '13

Instead of always using HMP use the QMP send-key command introduced in qemu 1.3. --- Notes: Version 2: - always try QMP instead of adding capability bit src/qemu/qemu_monitor_json.c | 69 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 1bf8baf..759198b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3372,11 +3372,70 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon, unsigned int *keycodes, unsigned int nkeycodes) { - /* - * FIXME: qmp sendkey has not been implemented yet, - * and qmp API of it cannot be anticipated, so we use hmp temporary. - */ - return qemuMonitorTextSendKey(mon, holdtime, keycodes, nkeycodes); + int ret = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + virJSONValuePtr keys = NULL; + virJSONValuePtr key = NULL; + unsigned int i; + + /* create the key data array */ + if (!(keys = virJSONValueNewArray())) + goto no_memory; + + for (i = 0; i < nkeycodes; i++) { + if (keycodes[i] > 0xffff) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("keycode %d is invalid: 0x%X"), i, keycodes[i]); + goto cleanup; + } + + /* create single key object */ + if (!(key = virJSONValueNewObject())) + goto no_memory; + + /* Union KeyValue has two, types, use the generic one */ + if (virJSONValueObjectAppendString(key, "type", "number") < 0) + goto no_memory; + + /* with the keycode */ + if (virJSONValueObjectAppendNumberInt(key, "data", keycodes[i]) < 0) + goto no_memory; + + if (virJSONValueArrayAppend(keys, key) < 0) + goto no_memory; + + key = NULL; + + } + + cmd = qemuMonitorJSONMakeCommand("send-key", + "a:keys", keys, + holdtime ? "U:hold-time" : NULL, holdtime, + NULL); + if (!cmd) + goto cleanup; + + if ((ret = qemuMonitorJSONCommand(mon, cmd, &reply)) < 0) + goto cleanup; + + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { + VIR_DEBUG("send-key command not found, trying HMP"); + ret = qemuMonitorTextSendKey(mon, holdtime, keycodes, nkeycodes); + } else { + ret = qemuMonitorJSONCheckError(cmd, reply); + } + +cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + virJSONValueFree(keys); + virJSONValueFree(key); + return ret; + +no_memory: + virReportOOMError(); + goto cleanup; } int qemuMonitorJSONScreendump(qemuMonitorPtr mon, -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix error return value for VirCommandNewArgList
by harryxiyou＠gmail.com 11 Apr '13

11 Apr '13

From: Harry Wei <harryxiyou(a)gmail.com> virCommandNewArgList may return NULL so we need not do following stuffs and just return '-1'. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> CC: Osier Yang <jyang(a)redhat.com> CC: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_backend_sheepdog.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 35a3a04..3452eaa 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -120,6 +120,8 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd; cmd = virCommandNewArgList(COLLIE, "node", "info", "-r", NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); @@ -142,6 +144,8 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); @@ -165,6 +169,8 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, } virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); + if (cmd == NULL) + return -1; virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); if (virCommandRun(cmd, NULL) < 0) @@ -251,6 +257,8 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, char *output = NULL; virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", vol->name, "-r", NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); @@ -293,6 +301,8 @@ virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "resize", vol->name, NULL); + if (cmd == NULL) + return -1; virCommandAddArgFormat(cmd, "%llu", capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); -- 1.7.9.5

2 1

[libvirt] [PATCH] qemu: Use QMP for send-key if supported
by Peter Krempa 11 Apr '13

11 Apr '13

Instead of always using HMP use the QMP send-key command introduced in qemu 1.3. --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 25 +++++++++++------ src/qemu/qemu_monitor.c | 5 ++-- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 64 ++++++++++++++++++++++++++++++++++++++++---- 6 files changed, 85 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50712b0..051285c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -216,6 +216,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "ipv6-migration", /* 135 */ "machine-opt", + "send-key", ); struct _virQEMUCaps { @@ -1954,6 +1955,8 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD); else if (STREQ(name, "nbd-server-start")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER); + else if (STREQ(name, "send-key")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_SEND_KEY); VIR_FREE(name); } VIR_FREE(commands); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b2dc588..bcd4daf 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -176,6 +176,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ + QEMU_CAPS_SEND_KEY = 137, /* send-key QMP command */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2c0d7d1..cfb6fc9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2227,14 +2227,16 @@ cleanup: return ret; } -static int qemuDomainSendKey(virDomainPtr domain, - unsigned int codeset, - unsigned int holdtime, - unsigned int *keycodes, - int nkeycodes, - unsigned int flags) +static int +qemuDomainSendKey(virDomainPtr domain, + unsigned int codeset, + unsigned int holdtime, + unsigned int *keycodes, + int nkeycodes, + unsigned int flags) { virQEMUDriverPtr driver = domain->conn->privateData; + virQEMUCapsPtr qemuCaps = NULL; virDomainObjPtr vm = NULL; int ret = -1; qemuDomainObjPrivatePtr priv; @@ -2251,7 +2253,8 @@ static int qemuDomainSendKey(virDomainPtr domain, keycodes[i]); if (keycode < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot translate keycode %u of %s codeset to rfb keycode"), + _("cannot translate keycode %u of %s codeset to " + "rfb keycode"), keycodes[i], virKeycodeSetTypeToString(codeset)); return -1; @@ -2263,6 +2266,10 @@ static int qemuDomainSendKey(virDomainPtr domain, if (!(vm = qemuDomObjFromDomain(domain))) goto cleanup; + if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, + vm->def->emulator))) + goto cleanup; + priv = vm->privateData; if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) @@ -2275,7 +2282,8 @@ static int qemuDomainSendKey(virDomainPtr domain, } qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes); + ret = qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes, + virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEND_KEY)); qemuDomainObjExitMonitor(driver, vm); endjob: @@ -2285,6 +2293,7 @@ endjob: cleanup: if (vm) virObjectUnlock(vm); + virObjectUnref(qemuCaps); return ret; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d1c6690..d9b5c23 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3008,14 +3008,15 @@ int qemuMonitorInjectNMI(qemuMonitorPtr mon) int qemuMonitorSendKey(qemuMonitorPtr mon, unsigned int holdtime, unsigned int *keycodes, - unsigned int nkeycodes) + unsigned int nkeycodes, + bool useQMP) { int ret; VIR_DEBUG("mon=%p, holdtime=%u, nkeycodes=%u", mon, holdtime, nkeycodes); - if (mon->json) + if (mon->json && useQMP) ret = qemuMonitorJSONSendKey(mon, holdtime, keycodes, nkeycodes); else ret = qemuMonitorTextSendKey(mon, holdtime, keycodes, nkeycodes); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b3808a8..fadad08 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -601,7 +601,8 @@ int qemuMonitorScreendump(qemuMonitorPtr mon, int qemuMonitorSendKey(qemuMonitorPtr mon, unsigned int holdtime, unsigned int *keycodes, - unsigned int nkeycodes); + unsigned int nkeycodes, + bool useQMP); typedef enum { BLOCK_JOB_ABORT, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 1bf8baf..43057fb 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3372,11 +3372,65 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon, unsigned int *keycodes, unsigned int nkeycodes) { - /* - * FIXME: qmp sendkey has not been implemented yet, - * and qmp API of it cannot be anticipated, so we use hmp temporary. - */ - return qemuMonitorTextSendKey(mon, holdtime, keycodes, nkeycodes); + int ret = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + virJSONValuePtr keys = NULL; + virJSONValuePtr key = NULL; + unsigned int i; + + /* create the key data array */ + if (!(keys = virJSONValueNewArray())) + goto no_memory; + + for (i = 0; i < nkeycodes; i++) { + if (keycodes[i] > 0xffff) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("keycode %d is invalid: 0x%X"), i, keycodes[i]); + goto cleanup; + } + + /* create single key object */ + if (!(key = virJSONValueNewObject())) + goto no_memory; + + /* Union KeyValue has two, types, use the generic one */ + if (virJSONValueObjectAppendString(key, "type", "number") < 0) + goto no_memory; + + /* with the keycode */ + if (virJSONValueObjectAppendNumberInt(key, "data", keycodes[i]) < 0) + goto no_memory; + + if (virJSONValueArrayAppend(keys, key) < 0) + goto no_memory; + + key = NULL; + + } + + cmd = qemuMonitorJSONMakeCommand("send-key", + "a:keys", keys, + holdtime ? "U:hold-time" : NULL, holdtime, + NULL); + if (!cmd) + goto cleanup; + + if ((ret = qemuMonitorJSONCommand(mon, cmd, &reply)) < 0) + goto cleanup; + + ret = qemuMonitorJSONCheckError(cmd, reply); + +cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + virJSONValueFree(keys); + virJSONValueFree(key); + return ret; + +no_memory: + virReportOOMError(); + goto cleanup; } int qemuMonitorJSONScreendump(qemuMonitorPtr mon, -- 1.8.1.5

3 4

[libvirt] [PATCH] virsh: Update list of shutdown/reboot modes
by Michal Privoznik 11 Apr '13

11 Apr '13

As of 76d9f65644 we are supporting two new modes: initctl and signal. However, these are missing in help listing. --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c088468..bd6192e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4568,7 +4568,7 @@ static const vshCmdOptDef opts_shutdown[] = { }, {.name = "mode", .type = VSH_OT_STRING, - .help = N_("shutdown mode: acpi|agent") + .help = N_("shutdown mode: acpi|agent|initctl|signal") }, {.name = NULL} }; @@ -4654,7 +4654,7 @@ static const vshCmdOptDef opts_reboot[] = { }, {.name = "mode", .type = VSH_OT_STRING, - .help = N_("shutdown mode: acpi|agent") + .help = N_("shutdown mode: acpi|agent|initctl|signal") }, {.name = NULL} }; -- 1.8.1.5

2 1

[libvirt] [libvirt-designer][PATCH] Don't redefine _FORTIFY_SOURCE macro
by Michal Privoznik 11 Apr '13

11 Apr '13

If the _FORTIFY_SOURCE has been already defined, we unconditionally redefine it, leaving us with warning/error thrown at compilation time. --- m4/virt-compile-warnings.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 913abca..1c58ebe 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -86,7 +86,7 @@ AC_DEFUN([LIBVIRT_DESIGNER_COMPILE_WARNINGS],[ # Use improved glibc headers AH_VERBATIM([FORTIFY_SOURCE], [/* Enable compile-time and run-time bounds-checking, and some warnings. */ - #if defined __OPTIMIZE__ && __OPTIMIZE__ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ # define _FORTIFY_SOURCE 2 #endif ]) -- 1.8.1.5

2 2

[libvirt] [libvirt-designer][PATCH] test: Adapt to new gvir_designer_domain_new signature
by Michal Privoznik 11 Apr '13

11 Apr '13

After 46be1aed the signature of gvir_designer_domain_new has changed. The OsinfoDb parameter appeared there. However, the test suite hasn't been adapted. --- libvirt-designer/test-designer-domain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libvirt-designer/test-designer-domain.c b/libvirt-designer/test-designer-domain.c index a3d62b6..bbd5a28 100644 --- a/libvirt-designer/test-designer-domain.c +++ b/libvirt-designer/test-designer-domain.c @@ -129,12 +129,14 @@ static const gchar *capslxcxml = static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer opaque) { OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); + OsinfoDb *db = osinfo_db_new(); OsinfoPlatform *platform = osinfo_platform_new("http://myhypervisor.org/awesome/6.6.6"); GVirConfigCapabilities *caps = gvir_config_capabilities_new_from_xml(capsqemuxml, NULL); - *design = gvir_designer_domain_new(os, platform, caps); + *design = gvir_designer_domain_new(db, os, platform, caps); g_object_unref(os); + g_object_unref(db); g_object_unref(platform); g_object_unref(caps); } @@ -143,12 +145,14 @@ static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer static void test_domain_container_setup(GVirDesignerDomain **design, gconstpointer opaque) { OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); + OsinfoDb *db = osinfo_db_new(); OsinfoPlatform *platform = osinfo_platform_new("http://myhypervisor.org/awesome/6.6.6"); GVirConfigCapabilities *caps = gvir_config_capabilities_new_from_xml(capslxcxml, NULL); - *design = gvir_designer_domain_new(os, platform, caps); + *design = gvir_designer_domain_new(db, os, platform, caps); g_object_unref(os); + g_object_unref(db); g_object_unref(platform); g_object_unref(caps); } -- 1.8.1.5

2 2

[libvirt] [PATCH] bridge: add the firewalld zone support
by Federico Simoncelli 11 Apr '13

11 Apr '13

This patch adds the support for the firewalld zones in the virtual bridges managed by libvirt allowing to configure the rules as for all the other interfaces. After assigning a fwzone to the bridge it is then possible to configure the firewall rules through the firwalld daemon, e.g. enabling or disabling connections to certain services located on the host. The firewalld events (e.g. restart, reload) are managed with the preexisting infrastructure that is already in place to reinstate the general iptables rules. Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- docs/formatnetwork.html.in | 5 +- docs/schemas/network.rng | 6 +++ src/conf/network_conf.c | 8 +++- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 4dd0415..e6d7d9c 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -69,7 +69,7 @@ <pre> ... - <bridge name="virbr0" stp="on" delay="5"/> + <bridge name="virbr0" fwzone="internal" stp="on" delay="5"/> <domain name="example.com"/> <forward mode="nat" dev="eth0"/> ...</pre> @@ -91,6 +91,9 @@ is 'on' or 'off' (default is 'on'). Attribute <code>delay</code> sets the bridge's forward delay value in seconds (default is 0). + Attribute <code>fwzone</code> specifies the firewalld zone to use + for the bridge device (the default is no zone and firewalld will + configure the device with its default zone). Since 0.3.0 </dd> <dt><code>domain</code></dt> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 6c3fae2..2f92cfc 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -66,6 +66,12 @@ </attribute> </optional> + <optional> + <attribute name="fwzone"> + <ref name="genericName"/> + </attribute> + </optional> + </element> </optional> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 968cf11..cf163e0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1749,6 +1749,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) def->bridge = virXPathString("string(./bridge[1]/@name)", ctxt); stp = virXPathString("string(./bridge[1]/@stp)", ctxt); def->stp = (stp && STREQ(stp, "off")) ? 0 : 1; + def->fwzone = virXPathString("string(./bridge[1]/@fwzone)", ctxt); if (virXPathULong("string(./bridge[1]/@delay)", ctxt, &def->delay) < 0) def->delay = 0; @@ -1880,9 +1881,10 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) } /* fall through to next case */ case VIR_NETWORK_FORWARD_BRIDGE: - if (def->delay || stp) { + if (def->delay || stp || def->fwzone) { virReportError(VIR_ERR_XML_ERROR, - _("bridge delay/stp options only allowed in route, nat, and isolated mode, not in %s (network '%s')"), + _("bridge delay/stp/fwzone options only allowed in " + "route, nat, and isolated mode, not in %s (network '%s')"), virNetworkForwardTypeToString(def->forward.type), def->name); goto error; @@ -2370,6 +2372,8 @@ virNetworkDefFormatInternal(virBufferPtr buf, virBufferAddLit(buf, "<bridge"); if (def->bridge) virBufferEscapeString(buf, " name='%s'", def->bridge); + if (def->fwzone) + virBufferEscapeString(buf, " fwzone='%s'", def->fwzone); virBufferAsprintf(buf, " stp='%s' delay='%ld' />\n", def->stp ? "on" : "off", def->delay); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 6ce9a00..80ee75f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -194,6 +194,7 @@ struct _virNetworkDef { char *bridge; /* Name of bridge device */ char *domain; + char *fwzone; /* The firewalld zone */ unsigned long delay; /* Bridge forward delay (ms) */ unsigned int stp :1; /* Spanning tree protocol */ virMacAddr mac; /* mac address of bridge device */ diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e8b314a..4875bbc 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -76,6 +76,29 @@ #define VIR_FROM_THIS VIR_FROM_NETWORK +#if HAVE_FIREWALLD +static char *firewall_cmd_path = NULL; + +static int +networkBridgeOnceInit(void) +{ + firewall_cmd_path = virFindFileInPath("firewall-cmd"); + if (!firewall_cmd_path) { + VIR_INFO("firewall-cmd not found on system. " + "firewalld support disabled for firewall zones."); + /* no need to verify the firewalld state as the service might + * be available now but not later on when it is actually used to + * configure the zones, or the opposite: it might be available + * now but not when needed. + */ + } + return 0; +} + +VIR_ONCE_GLOBAL_INIT(networkBridge) + +#endif + /* Main driver state */ struct network_driver { virMutex lock; @@ -1893,6 +1916,75 @@ networkRemoveGeneralIp6tablesRules(struct network_driver *driver, iptablesRemoveForwardRejectOut(driver->iptables, AF_INET6, network->def->bridge); } +#if HAVE_FIREWALLD +static int +networkAddInterfaceZone(virNetworkObjPtr network) +{ + int status; + + if ((network->def->bridge == NULL) || (network->def->fwzone == NULL)) + return 0; + + networkBridgeInitialize(); + + if (firewall_cmd_path == NULL) { + VIR_WARN("firewall-cmd is missing cannot add interface '%s' to " + "firewall zone '%s'", network->def->bridge, + network->def->fwzone); + return -1; + } + + virCommandPtr cmd = virCommandNew(firewall_cmd_path); + /* the --change-zone command is used (instead of --add-interface) to avoid + * errors if the device was already assigned to a different zone. + */ + virCommandAddArgList(cmd, "--zone", network->def->fwzone, + "--change-zone", network->def->bridge, NULL); + if (virCommandRun(cmd, &status) < 0 || status != 0) { + VIR_ERROR("failed to add interface '%s' to firewall zone '%s'", + network->def->bridge, network->def->fwzone); + } else { + VIR_DEBUG("interface '%s' has been added to firewall zone '%s'", + network->def->bridge, network->def->fwzone); + } + + virCommandFree(cmd); + + return 0; +} + +static void +networkRemoveInterfaceZone(virNetworkObjPtr network) +{ + int status; + + if (network->def->bridge == NULL) + return; + + networkBridgeInitialize(); + + if (firewall_cmd_path == NULL) { + VIR_WARN("firewall-cmd is missing cannot remove interface '%s' " + "from its firewall zone", network->def->bridge); + return; + } + + virCommandPtr cmd = virCommandNew(firewall_cmd_path); + /* not specifying a zone removes the interface from any zone */ + virCommandAddArgList(cmd, "--remove-interface", + network->def->bridge, NULL); + if (virCommandRun(cmd, &status) < 0 || status != 0) { + VIR_ERROR("failed to remove interface '%s' from its firewall zone", + network->def->bridge); + } else { + VIR_DEBUG("interface '%s' has been removed from its firewall zone", + network->def->bridge); + } + + virCommandFree(cmd); +} +#endif + static int networkAddGeneralIptablesRules(struct network_driver *driver, virNetworkObjPtr network) @@ -2000,9 +2092,27 @@ networkAddGeneralIptablesRules(struct network_driver *driver, goto err9; } +#if HAVE_FIREWALLD + if (networkAddInterfaceZone(network) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("failed to add interface '%s' to the firewall zone '%s'"), + network->def->bridge, network->def->fwzone); + goto err10; + } +#else + if (network->def->fwzone != NULL) + VIR_WARN("firewalld support not compiled into this binary, interface " + "'%s' not added to firewall zone '%s'", network->def->bridge, + network->def->fwzone); +#endif + return 0; /* unwind in reverse order from the point of failure */ +#if HAVE_FIREWALLD +err10: + networkRemoveGeneralIp6tablesRules(driver, network); +#endif err9: iptablesRemoveForwardAllowCross(driver->iptables, AF_INET, network->def->bridge); err8: @@ -2032,6 +2142,10 @@ networkRemoveGeneralIptablesRules(struct network_driver *driver, int ii; virNetworkIpDefPtr ipv4def; +#if HAVE_FIREWALLD + networkRemoveInterfaceZone(network); +#endif + networkRemoveGeneralIp6tablesRules(driver, network); for (ii = 0; -- 1.8.1.4

1 0

[libvirt] [PATCH v3 1/3] Add NVRAM device
by Li Zhang 11 Apr '13

11 Apr '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For pSeries guest in QEMU, NVRAM is one kind of spapr-vio device. Users are allowed to specify spapr-vio devices'address. But NVRAM is not supported in libvirt. So this patch is to add NVRAM device to allow users to specify its address. In QEMU, NVRAM device's address is specified by "-global spapr-nvram.reg=xxxxx". In libvirt, XML file is defined as the following: <nvram> <address type='spapr-vio' reg='0x3000'/> </nvram> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v3 -> v2: * Add NVRAM in domaincommon.rng and formatdomain.xml.in suggested by Daniel P.Berrange * Add NVRAM test cases suggested by Daniel P.Berrange * Remove nvram allocation when it is not specified suggested by Daniel P.Berrange * Add several error reports suggested by Daniel P.Berrange v2 -> v1: * Add NVRAM parameters parsing in qemuParseCommandLine src/conf/domain_conf.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 10 +++++++ src/qemu/qemu_command.c | 67 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_command.h | 2 ++ 4 files changed, 155 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3278e9c..c37487c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -190,6 +190,7 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "smartcard", "chr", "memballoon", + "nvram", "rng") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, @@ -1515,6 +1516,16 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) VIR_FREE(def); } +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def) +{ + if (!def) + return; + + virDomainDeviceInfoClear(&def->info); + + VIR_FREE(def); +} + void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def) { if (!def) @@ -1678,6 +1689,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: break; } @@ -1869,6 +1881,7 @@ void virDomainDefFree(virDomainDefPtr def) virDomainWatchdogDefFree(def->watchdog); virDomainMemballoonDefFree(def->memballoon); + virDomainNVRAMDefFree(def->nvram); for (i = 0; i < def->nseclabels; i++) virSecurityLabelDefFree(def->seclabels[i]); @@ -2429,6 +2442,12 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, if (cb(def, &device, &def->rng->info, opaque) < 0) return -1; } + if (def->nvram) { + device.type = VIR_DOMAIN_DEVICE_NVRAM; + device.data.nvram = def->nvram; + if (cb(def, &device, &def->nvram->info, opaque) < 0) + return -1; + } device.type = VIR_DOMAIN_DEVICE_HUB; for (i = 0; i < def->nhubs ; i++) { device.data.hub = def->hubs[i]; @@ -2460,6 +2479,7 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_RNG: break; @@ -7703,6 +7723,23 @@ error: goto cleanup; } +static virDomainNVRAMDefPtr +virDomainNVRAMDefParseXML(const xmlNodePtr node, + unsigned int flags) +{ + virDomainNVRAMDefPtr def; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + return NULL; + } + + if ( virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0 ) + return NULL; + + return def; +} + static virSysinfoDefPtr virSysinfoParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -10844,6 +10881,26 @@ virDomainDefParseXML(virCapsPtr caps, VIR_FREE(nodes); } + def->nvram = NULL; + if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) { + goto error; + } + + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single nvram device is supported")); + goto error; + } + + if (n > 0) { + virDomainNVRAMDefPtr nvram = + virDomainNVRAMDefParseXML(nodes[0], flags); + if (!nvram) + goto error; + def->nvram = nvram; + VIR_FREE(nodes); + } + /* analysis of the hub devices */ if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) { goto error; @@ -13854,6 +13911,21 @@ virDomainMemballoonDefFormat(virBufferPtr buf, } static int +virDomainNVRAMDefFormat(virBufferPtr buf, + virDomainNVRAMDefPtr def, + unsigned int flags) +{ + virBufferAsprintf(buf, " <nvram>\n"); + if (virDomainDeviceInfoIsSet(&def->info, flags)) + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + + virBufferAddLit(buf, " </nvram>\n"); + + return 0; +} + +static int virDomainSysinfoDefFormat(virBufferPtr buf, virSysinfoDefPtr def) { @@ -15161,6 +15233,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->rng) virDomainRNGDefFormat(buf, def->rng, flags); + if (def->nvram) + virDomainNVRAMDefFormat(buf, def->nvram, flags); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); @@ -16443,6 +16518,7 @@ virDomainDeviceDefCopy(virCapsPtr caps, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Copying definition of '%d' type " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 96f11ba..03b7c9a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -108,6 +108,9 @@ typedef virDomainChrDef *virDomainChrDefPtr; typedef struct _virDomainMemballoonDef virDomainMemballoonDef; typedef virDomainMemballoonDef *virDomainMemballoonDefPtr; +typedef struct _virDomainNVRAMDef virDomainNVRAMDef; +typedef virDomainNVRAMDef *virDomainNVRAMDefPtr; + typedef struct _virDomainSnapshotObj virDomainSnapshotObj; typedef virDomainSnapshotObj *virDomainSnapshotObjPtr; @@ -136,6 +139,7 @@ typedef enum { VIR_DOMAIN_DEVICE_SMARTCARD, VIR_DOMAIN_DEVICE_CHR, VIR_DOMAIN_DEVICE_MEMBALLOON, + VIR_DOMAIN_DEVICE_NVRAM, VIR_DOMAIN_DEVICE_RNG, VIR_DOMAIN_DEVICE_LAST @@ -162,6 +166,7 @@ struct _virDomainDeviceDef { virDomainSmartcardDefPtr smartcard; virDomainChrDefPtr chr; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virDomainRNGDefPtr rng; } data; }; @@ -1423,6 +1428,9 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; }; +struct _virDomainNVRAMDef { + virDomainDeviceInfo info; +}; enum virDomainSmbiosMode { VIR_DOMAIN_SMBIOS_NONE = 0, @@ -1883,6 +1891,7 @@ struct _virDomainDef { /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virCPUDefPtr cpu; virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; @@ -2015,6 +2024,7 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def); virDomainHostdevDefPtr virDomainHostdevDefAlloc(void); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4891b65..26c3001 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1169,6 +1169,15 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, goto cleanup; } + if (def->nvram) { + if (def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) + def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; + if (qemuAssignSpaprVIOAddress(def, &def->nvram->info, + 0x3000ul) < 0) + goto cleanup; + } + /* No other devices are currently supported on spapr-vio */ ret = 0; @@ -3809,6 +3818,32 @@ error: return NULL; } +char * +qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && + dev->info.addr.spaprvio.has_reg) { + virBufferAsprintf(&buf, "spapr-nvram.reg=0x%llx", + dev->info.addr.spaprvio.reg); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("NVRAM device address is not supported.\n")); + goto error; + } + + if (virBufferError(&buf)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&buf); + +error: + virBufferFreeAndReset(&buf); + return NULL; +} char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, @@ -7492,6 +7527,21 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } + if (def->nvram) { + if (def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) { + char *optstr; + virCommandAddArg(cmd, "-global"); + optstr = qemuBuildNVRAMDevStr(def->nvram); + if (!optstr) + goto error; + if (optstr) + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + } else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NVRAM device is not supported")); + } if (snapshot) virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); @@ -9584,6 +9634,23 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, goto error; } + } else if (STREQ(arg, "-global") && + STRPREFIX(progargv[i + 1], "spapr-nvram.reg=")) { + + WANT_VALUE(); + + if (VIR_ALLOC(def->nvram) < 0) + goto no_memory; + + val += strlen("spapr-nvram.reg="); + if (virStrToLong_ull(val, NULL, 16, + &def->nvram->info.addr.spaprvio.reg) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value for spapr-nvram.reg :" + "'%s'"), val); + goto error; + } + } else if (STREQ(arg, "-S")) { /* ignore, always added by libvirt */ } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 17687f4..2b60997 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -118,6 +118,8 @@ char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, virQEMUCapsPtr qemuCaps); +char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev); + char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps); -- 1.7.10.1

2 9

[libvirt] [PATCH] qemu: fix crash in qemuOpen
by Ján Tomko 11 Apr '13

11 Apr '13

If the path part of connection URI is not present, cfg is used unitialized. https://bugzilla.redhat.com/show_bug.cgi?id=950855 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2c0d7d1..0d41e39 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1025,16 +1025,16 @@ static virDrvOpenStatus qemuOpen(virConnectPtr conn, _("qemu state driver is not active")); goto cleanup; } + cfg = virQEMUDriverGetConfig(qemu_driver); if (conn->uri->path == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("no QEMU URI path given, try %s"), cfg->uri); goto cleanup; } - cfg = virQEMUDriverGetConfig(qemu_driver); if (cfg->privileged) { if (STRNEQ(conn->uri->path, "/system") && STRNEQ(conn->uri->path, "/session")) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.8.1.5

2 2

[libvirt] [PATCH v3] qemu: Set correct migrate host in client_migrate_info
by Michal Privoznik 11 Apr '13

11 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=920441 Currently, we are discarding listen attribute from qemu cookie even though we strive to gather it. This result in not so cool bug: if user have different networks, one for management/migration, and one for VNC/SPICE we pass incorrect host to the qemu in client_migrate_info. What we actually pass is remote hostname, while we should be passing remote listen address. It doesn't matter as long as these two are the same, but they don't need necessary to be like that. --- src/conf/domain_conf.c | 4 +++- src/qemu/qemu_migration.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 68f024f..6757738 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16557,8 +16557,10 @@ virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t ii) virDomainGraphicsListenDefPtr listenInfo = virDomainGraphicsGetListen(def, ii, false); + /* even a network can have a listen address */ if (!listenInfo || - (listenInfo->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS)) + !(listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || + listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK)) return NULL; return listenInfo->address; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 41ad768..a263668 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1720,6 +1720,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; + char *listenAddress = cookie->graphics->listen; if (!cookie) return 0; @@ -1733,12 +1734,17 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) return 0; + if (!listenAddress || + STREQ(listenAddress, "0.0.0.0") || + STREQ(listenAddress, "::")) + listenAddress = cookie->remoteHostname; + ret = qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, - cookie->remoteHostname, + listenAddress, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); -- 1.8.1.5

2 1

[libvirt] [PATCH] conf: fix error for parallel port mismatch
by Ján Tomko 11 Apr '13

11 Apr '13

--- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 68f024f..36a46da 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11940,7 +11940,7 @@ virDomainParallelDefCheckABIStability(virDomainChrDefPtr src, { if (src->target.port != dst->target.port) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target serial port %d does not match source %d"), + _("Target parallel port %d does not match source %d"), dst->target.port, src->target.port); return false; } -- 1.8.1.5

2 2

Re: [libvirt] [Autotest] [RFC] Autotest Project Weekly Hangout
by Amos Kong 11 Apr '13

11 Apr '13

CC: qemu-devel, kvm, libvirt-list On Thu, Apr 11, 2013 at 4:43 AM, Lucas Meneghel Rodrigues <lmr(a)redhat.com>wrote: > Hi guys, > > I'd like to propose yet another hipster-y initiative: A weekly hangout, > where contributors from all affiliations that work on autotest/virt-tests > or any project under the autotest umbrella get to talk about 30 minutes on > issues, new features and similar stuff. > > The proposed date/time would be every Thursday, 12:00 PM UTC. > $ date -d 'Thursday, 12:00 PM UTC' Thu Apr 11 20:00:00 CST 2013 (for +8000 timezone) > > So, what do you guys say? > > Cheers, > > Lucas > > ______________________________**_________________ > Autotest-kernel mailing list > Autotest-kernel(a)redhat.com > https://www.redhat.com/**mailman/listinfo/autotest-**kernel<https://www.redhat.com/mailman/listinfo/autotest-kernel> >

1 0

[libvirt] [PATCH 0/8] cleanup: Use bool type instead of bitfield
by Osier Yang 11 Apr '13

11 Apr '13

This changes all the bitfield into bool type in domain_conf.h, except domain->autostart, domain->persistent, and domain->updated, as the public APIs like virDomainIsPersistent returns domain->persistent as integer, they can be changed internally, but not that deserved. Osier Yang (8): Cleanup: Change datatype of hostdev->managed to boolean Cleanup: Change datatype of origstate's members into boolean cleanup: Change datatype of hostdev->missing to boolean cleanup: Change datatype of auth->expires to boolean cleanup: Change datatype of disk->shared to boolean cleanup: Change datatype of disk->transient to boolean cleanup: Change datatype of disk->readonly to boolean cleanup: Change datatype of fs->readonly to boolean src/conf/domain_conf.c | 20 ++++++------- src/conf/domain_conf.h | 20 ++++++------- src/lxc/lxc_hostdev.c | 2 +- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 10 +++---- src/qemu/qemu_hostdev.c | 2 +- src/util/virpci.c | 64 ++++++++++++++++++++-------------------- src/util/virpci.h | 8 ++--- src/vbox/vbox_tmpl.c | 12 ++++---- src/xenxs/xen_sxpr.c | 8 ++--- src/xenxs/xen_xm.c | 8 ++--- 11 files changed, 78 insertions(+), 78 deletions(-) -- 1.8.1.4

2 10

[libvirt] Several pending patches for PPC64
by Li Zhang 11 Apr '13

11 Apr '13

Hi Daniel, I have several patches pending in mailing list. Would you mind giving more suggestions? Thanks a lot. :) [PATCH v4 1/2] Add USB option capability https://www.redhat.com/archives/libvir-list/2013-April/msg00587.html [PATCH v4 2/2]testcase: Add a new USB option test case https://www.redhat.com/archives/libvir-list/2013-April/msg00586.html [PATCH v3 1/3] Add NVRAM device https://www.redhat.com/archives/libvir-list/2013-March/msg01508.html [PATCH v3 2/3]doc: add NVRAM device https://www.redhat.com/archives/libvir-list/2013-March/msg01509.html [PATCH v3 3/3] Add NVRAM test cases https://www.redhat.com/archives/libvir-list/2013-March/msg01510.html [PATCH 1/1][RESEND] Set legacy USB option with default for ppc64. https://www.redhat.com/archives/libvir-list/2013-April/msg00588.html [PATCH 1/1][RESEND] ppc64 cpu features https://www.redhat.com/archives/libvir-list/2013-March/msg00726.html

1 0

Re: [libvirt] fail to convert qemu xml to args with libvirt-1.0.4: An error occurred, but the cause is unknown
by Yin Olivia-R63875 11 Apr '13

11 Apr '13

Hi Daniel, Just Ping. Did you ever successfully convert QEMU xml file to argv on other platforms? Best Regards, Olivia > -----Original Message----- > From: Yin Olivia-R63875 > Sent: Tuesday, April 09, 2013 1:22 PM > To: 'libvir-list(a)redhat.com' > Cc: 'libvirt-users(a)redhat.com' > Subject: fail to convert qemu xml to args with libvirt-1.0.4: An error > occurred, but the cause is unknown > > Hi, > > I used to convert qemu XML to args with libvirt-1.0.3. > But it failed to convert with libvirt-1.0.4. > > # virsh domxml-to-native qemu-argv test.xml >test.sh > error: An error occurred, but the cause is unknown > > > Comparing the debug file as below: > 1) lbvirt-1.0.3 > <cut> > 2013-04-09 03:23:47.296+0000: 2669: debug : > virEventPollInterruptLocked:716 : Interrupting > 2013-04-09 03:23:47.296+0000: 2669: debug : virNetClientIO:1807 : All done > with our call head=(nil) call=0x100871c0 rv=0 > 2013-04-09 03:23:47.297+0000: 2670: debug : virEventPollRunOnce:640 : Poll > got 1 event(s) > 2013-04-09 03:23:47.297+0000: 2670: debug : > virEventPollDispatchTimeouts:425 : Dispatch 0 > 2013-04-09 03:23:47.297+0000: 2669: debug : virNetMessageFree:73 : > msg=0x10087500 nfds=0 cb=(nil) > 2013-04-09 03:23:47.297+0000: 2670: debug : > virEventPollDispatchHandles:470 : Dispatch 1 > 2013-04-09 03:23:47.297+0000: 2670: debug : > virEventPollDispatchHandles:484 : i=0 w=1 > 2013-04-09 03:23:47.297+0000: 2669: debug : virConnectClose:1483 : > conn=0x100878b8 <cut> > > 2) libvirt-1.0.4 > <cut> > 2013-04-09 03:07:58.012+0000: 2834: debug : > virEventPollInterruptLocked:716 : Interrupting > 2013-04-09 03:07:58.012+0000: 2834: debug : virNetClientIO:1810 : All done > with our call head=(nil) call=0x10089db8 rv=0 > 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollRunOnce:640 : Poll > got 1 event(s) > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollDispatchTimeouts:425 : Dispatch 0 > 2013-04-09 03:07:58.012+0000: 2834: error : > virNetClientProgramDispatchError:175 : An error occurred, but the cause is > unknown > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollDispatchHandles:470 : Dispatch 1 > 2013-04-09 03:07:58.012+0000: 2834: debug : virNetMessageFree:73 : > msg=0x1008a0f8 nfds=0 cb=(nil) > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollDispatchHandles:484 : i=0 w=1 > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollDispatchHandles:498 : EVENT_POLL_DISPATCH_HANDLE: watch=1 > events=1 > 2013-04-09 03:07:58.012+0000: 2835: debug : > virEventPollCleanupTimeouts:516 : Cleanup 0 > 2013-04-09 03:07:58.013+0000: 2835: debug : > virEventPollCleanupTimeouts:552 : Found 0 out of 0 timeout slots used, > releasing 0 > 2013-04-09 03:07:58.013+0000: 2835: debug : virEventPollCleanupHandles:564 : > Cleanup 2 > 2013-04-09 03:07:58.013+0000: 2834: debug : virConnectClose:1483 : > conn=0x1008a4b0 <cut> > > > How can I debug this cause unknown error? > > Best Regards, > Olivia

1 0

[libvirt] [PATCH] conf: fix a memory leak when parsing nat port XML nodes
by Guannan Ren 11 Apr '13

11 Apr '13

==5306== 8 bytes in 1 blocks are definitely lost in loss record 24 of 277 ==5306== at 0x4C28B2F: calloc (vg_replace_malloc.c:593) ==5306== by 0x5293CAF: virAllocN (viralloc.c:152) ==5306== by 0x52DFEAE: virXPathNodeSet (virxml.c:611) ==5306== by 0x5313DD9: virNetworkDefParseXML (network_conf.c:1408) ==5306== by 0x53170F6: virNetworkObjUpdateParseFile (network_conf.c:2031) ==5306== by 0x131DA63C: networkStartup (bridge_driver.c:279) ==5306== by 0x53481DF: virStateInitialize (libvirt.c:822) ==5306== by 0x40DF44: daemonRunStateInit (libvirtd.c:877) ==5306== by 0x52D2FF5: virThreadHelper (virthreadpthread.c:161) ==5306== by 0x5D00C52: start_thread (in /usr/lib64/libpthread-2.17.so) ==5306== by 0x6410ECC: clone (in /usr/lib64/libc-2.17.so) --- src/conf/network_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c5535e6..968cf11 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1440,6 +1440,7 @@ cleanup: VIR_FREE(addrStart); VIR_FREE(addrEnd); VIR_FREE(natAddrNodes); + VIR_FREE(natPortNodes); ctxt->node = save; return ret; } -- 1.7.11.2

2 2

[libvirt] [libvirt-designer v2] Add Vala API
by Zeeshan Ali (Khattak) 11 Apr '13

11 Apr '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This is mostly (modified) copy&paste from libvirt-glib. --- v2: Removed redundant libvirt-gobject dependency. Makefile.am | 2 +- configure.ac | 37 +++++++++++++++++++++++++++++++++++++ vapi/Makefile.am | 25 +++++++++++++++++++++++++ vapi/libvirt-designer-1.0.deps | 2 ++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 vapi/Makefile.am create mode 100644 vapi/libvirt-designer-1.0.deps diff --git a/Makefile.am b/Makefile.am index f5bcc47..53d36ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = libvirt-designer examples docs +SUBDIRS = libvirt-designer vapi examples docs ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index a9c5c34..c999826 100644 --- a/configure.ac +++ b/configure.ac @@ -71,10 +71,46 @@ if test "x$enable_examples" != "xno" ; then fi AM_CONDITIONAL(WITH_EXAMPLES, [test "x$enable_examples" = "xyes"]) +AC_ARG_ENABLE([vala], + AS_HELP_STRING([--enable-vala], [enable Vala binding generation]), + [], [enable_vala=check]) +if test "x$enable_introspection" = "xyes" ; then + if test "x$enable_vala" != "xno" ; then + AC_PATH_PROG(VAPIGEN, vapigen, no) + if test "x$VAPIGEN" == "xno"; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + else + AC_MSG_ERROR([Cannot find the "vapigen" binary in your PATH]) + fi + fi + AC_SUBST(VAPIGEN) + fi + if test "x$enable_vala" != "xno" ; then + AC_MSG_CHECKING([$VAPIGEN support for --metadatadir]) + $VAPIGEN --help | grep metadatadir 1>/dev/null 2>&1 + if test $? != 0 ; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + AC_MSG_RESULT([no]) + else + AC_MSG_ERROR(["vapigen" binary in your PATH is too old (< 0.13)]) + fi + else + AC_MSG_RESULT([no]) + fi + fi + if test "x$enable_vala" = "xcheck" ; then + enable_vala=yes + fi +fi +AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"]) + AC_OUTPUT(Makefile libvirt-designer/Makefile libvirt-designer.spec libvirt-designer-1.0.pc + vapi/Makefile docs/Makefile examples/Makefile) @@ -83,6 +119,7 @@ AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) +AC_MSG_NOTICE([ Vala API: $enable_vala]) AC_MSG_NOTICE([ examples: $enable_examples]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) diff --git a/vapi/Makefile.am b/vapi/Makefile.am new file mode 100644 index 0000000..0c5d117 --- /dev/null +++ b/vapi/Makefile.am @@ -0,0 +1,25 @@ +NULL = + +if WITH_VALA +vapidir = $(datadir)/vala/vapi +vapi_DATA = \ + libvirt-designer-1.0.deps \ + libvirt-designer-1.0.vapi \ + $(NULL) + +libvirt-designer-1.0.vapi: $(top_builddir)/libvirt-designer/LibvirtDesigner-1.0.gir + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=$(builddir) \ + --pkg gio-2.0 \ + --pkg libosinfo-1.0 \ + --pkg libvirt-gconfig-1.0 \ + --library libvirt-designer-1.0 \ + --metadatadir=$(srcdir) \ + $< +endif + +CLEANFILES = \ + libvirt-designer-1.0.vapi \ + $(NULL) + +EXTRA_DIST = libvirt-designer-1.0.deps diff --git a/vapi/libvirt-designer-1.0.deps b/vapi/libvirt-designer-1.0.deps new file mode 100644 index 0000000..ba30bfd --- /dev/null +++ b/vapi/libvirt-designer-1.0.deps @@ -0,0 +1,2 @@ +libosinfo-1.0 +libvirt-gconfig-1.0 -- 1.8.1.4

1 0

[libvirt] [libvirt-designer] Add Vala API
by Zeeshan Ali (Khattak) 11 Apr '13

11 Apr '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This is mostly (modified) copy&paste from libvirt-glib. --- Makefile.am | 2 +- configure.ac | 37 +++++++++++++++++++++++++++++++++++++ vapi/Makefile.am | 26 ++++++++++++++++++++++++++ vapi/libvirt-designer-1.0.deps | 3 +++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 vapi/Makefile.am create mode 100644 vapi/libvirt-designer-1.0.deps diff --git a/Makefile.am b/Makefile.am index f5bcc47..53d36ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = libvirt-designer examples docs +SUBDIRS = libvirt-designer vapi examples docs ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index a9c5c34..c999826 100644 --- a/configure.ac +++ b/configure.ac @@ -71,10 +71,46 @@ if test "x$enable_examples" != "xno" ; then fi AM_CONDITIONAL(WITH_EXAMPLES, [test "x$enable_examples" = "xyes"]) +AC_ARG_ENABLE([vala], + AS_HELP_STRING([--enable-vala], [enable Vala binding generation]), + [], [enable_vala=check]) +if test "x$enable_introspection" = "xyes" ; then + if test "x$enable_vala" != "xno" ; then + AC_PATH_PROG(VAPIGEN, vapigen, no) + if test "x$VAPIGEN" == "xno"; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + else + AC_MSG_ERROR([Cannot find the "vapigen" binary in your PATH]) + fi + fi + AC_SUBST(VAPIGEN) + fi + if test "x$enable_vala" != "xno" ; then + AC_MSG_CHECKING([$VAPIGEN support for --metadatadir]) + $VAPIGEN --help | grep metadatadir 1>/dev/null 2>&1 + if test $? != 0 ; then + if test "x$enable_vala" == "xcheck" ; then + enable_vala=no + AC_MSG_RESULT([no]) + else + AC_MSG_ERROR(["vapigen" binary in your PATH is too old (< 0.13)]) + fi + else + AC_MSG_RESULT([no]) + fi + fi + if test "x$enable_vala" = "xcheck" ; then + enable_vala=yes + fi +fi +AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"]) + AC_OUTPUT(Makefile libvirt-designer/Makefile libvirt-designer.spec libvirt-designer-1.0.pc + vapi/Makefile docs/Makefile examples/Makefile) @@ -83,6 +119,7 @@ AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) +AC_MSG_NOTICE([ Vala API: $enable_vala]) AC_MSG_NOTICE([ examples: $enable_examples]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) diff --git a/vapi/Makefile.am b/vapi/Makefile.am new file mode 100644 index 0000000..0aecb7e --- /dev/null +++ b/vapi/Makefile.am @@ -0,0 +1,26 @@ +NULL = + +if WITH_VALA +vapidir = $(datadir)/vala/vapi +vapi_DATA = \ + libvirt-designer-1.0.deps \ + libvirt-designer-1.0.vapi \ + $(NULL) + +libvirt-designer-1.0.vapi: $(top_builddir)/libvirt-designer/LibvirtDesigner-1.0.gir + $(AM_V_GEN)$(VAPIGEN) \ + --vapidir=$(builddir) \ + --pkg gio-2.0 \ + --pkg libosinfo-1.0 \ + --pkg libvirt-gobject-1.0 \ + --pkg libvirt-gconfig-1.0 \ + --library libvirt-designer-1.0 \ + --metadatadir=$(srcdir) \ + $< +endif + +CLEANFILES = \ + libvirt-designer-1.0.vapi \ + $(NULL) + +EXTRA_DIST = libvirt-designer-1.0.deps diff --git a/vapi/libvirt-designer-1.0.deps b/vapi/libvirt-designer-1.0.deps new file mode 100644 index 0000000..757e44e --- /dev/null +++ b/vapi/libvirt-designer-1.0.deps @@ -0,0 +1,3 @@ +libosinfo-1.0 +libvirt-gobject-1.0 +libvirt-gconfig-1.0 -- 1.8.1.4

1 0

[libvirt] [PATCH] v2:Support for adding a static route to a bridge
by Gene Czarcinski 11 Apr '13

11 Apr '13

This patch adds support for adding a static route for a network. The "via" specifies the gateway's IP address. Both IPv4 and IPv6 static routes are supported although it is expected that this functionality will have more use with IPv6. Extensive tests are done to validate that the input definitions are correct. For example, for a static route ip definition, the address must be for a network and not a host. Additional checks are added to ensure that the specified gateway has a network defined on this bridge. Whan a static route is added to a bridge, there is a slight possibility that the gateway address will be incorrect. If this is handled as an error, that bridge becomes unusable and can only be recovered by rebooting. If the error is ignored, then that network can be destroyed and the network definition file edited to correct the problem. Unfortunately, the error message only appears in syslog. However, with the checks performed when the network definition file is parsed, it is unlikely that this condition will ever occur. The command used is of the following form: ip route add <address>/<prefix> via <gateway> dev <virbr-bridge> \ proto static metric 1 . Signed-off-by: Gene Czarcinski <gene(a)czarc.net> --- docs/formatnetwork.html.in | 32 +++- docs/schemas/network.rng | 3 + src/conf/network_conf.c | 168 ++++++++++++++++++++- src/conf/network_conf.h | 2 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 42 ++++++ src/util/virnetdev.c | 47 ++++++ src/util/virnetdev.h | 5 + .../networkxml2xmlin/dhcp6host-routed-network.xml | 4 + .../networkxml2xmlout/dhcp6host-routed-network.xml | 4 + 10 files changed, 304 insertions(+), 4 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 4dd0415..f0cadf0 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -537,7 +537,9 @@ associated with the virtual network, and optionally enable DHCP services. These elements are only valid for isolated networks (no <code>forward</code> element specified), and for those with - a forward mode of 'route' or 'nat'. + a forward mode of 'route' or 'nat'. Another optional addressing + element <code>via</code> can be used to establish a static + route for IPv4 or IPv6 networks. <pre> @@ -560,6 +562,7 @@ </dhcp> </ip> <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> + <ip family="ipv6" address="2001:db9:ca1:1::" prefix="64" via="2001:db8:ca2:2::2" /> </network></pre> <dl> @@ -633,7 +636,10 @@ IPv6, multiple addresses on a single network, <code>family</code>, and <code>prefix</code> are support Since 0.8.7. Similar to IPv4, one IPv6 address per network can also have - a <code>dhcp</code> definition. Since 1.0.1 + a <code>dhcp</code> definition. Since 1.0.1 The <code>via</code> + can be used to establish a static route for IPv4 or IPv6 networks. It is an error + to specify <code>via</code> and <code>dhcp</code> for the same IP address. + Since 1.0.4 <dl> <dt><code>tftp</code></dt> @@ -809,6 +815,28 @@ </ip> </network></pre> + + Below is yet another IPv6 variation. This variation has only IPv6 + defined with DHCPv6 on the primary IPv6 network. A second IPv6 + network has a static link to a host on the first (virtual) IPv6 + network. Since 1.0.4 + + + <pre> + <network> + <name>net7</name> + <bridge name="virbr7" /> + <forward mode="route"/> + <ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" > + <dhcp> + <range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:8::" prefix="64" via="2001:db8:ca2::4" > + </ip> + </network></pre> + <h3><a name="examplesPrivate">Isolated network config</a></h3> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 6c3fae2..c1cca23 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -262,6 +262,9 @@ <attribute name="family"><ref name="addr-family"/></attribute> </optional> <optional> + <attribute name="via"><ref name="ipAddr"/></attribute> + </optional> + <optional> <element name="tftp"> <attribute name="root"><text/></attribute> </element> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c022fe4..ea98d85 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1149,8 +1149,10 @@ virNetworkIPDefParseXML(const char *networkName, xmlNodePtr cur, save; char *address = NULL, *netmask = NULL; - unsigned long prefix; + char *gateway = NULL; + unsigned long prefix = 0; int result = -1; + virSocketAddr testAddr; save = ctxt->node; ctxt->node = node; @@ -1162,6 +1164,7 @@ virNetworkIPDefParseXML(const char *networkName, def->prefix = 0; else def->prefix = prefix; + gateway = virXPathString("string(./@via)", ctxt); netmask = virXPathString("string(./@netmask)", ctxt); @@ -1175,7 +1178,17 @@ virNetworkIPDefParseXML(const char *networkName, } - /* validate family vs. address */ + if (gateway) { + if (virSocketAddrParse(&def->gateway, gateway, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Bad gateway address '%s' in definition of network '%s'"), + gateway, networkName); + goto cleanup; + } + + } + + /* validate family vs. address (and gateway address too) */ if (def->family == NULL) { if (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) || VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_UNSPEC))) { @@ -1184,6 +1197,20 @@ virNetworkIPDefParseXML(const char *networkName, address, networkName); goto cleanup; } + if (gateway && + (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_UNSPEC)))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("no family specified for non-IPv4 gateway address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (def->prefix > 0 && def->prefix > 32) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv4 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } } else if (STREQ(def->family, "ipv4")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1191,6 +1218,18 @@ virNetworkIPDefParseXML(const char *networkName, address, networkName); goto cleanup; } + if (gateway && (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("family 'ipv4' specified for non-IPv4 gateway address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (def->prefix > 0 && def->prefix > 32) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv4 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } } else if (STREQ(def->family, "ipv6")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1198,6 +1237,24 @@ virNetworkIPDefParseXML(const char *networkName, address, networkName); goto cleanup; } + if (def->prefix == 0 || def->prefix > 64) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv6 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } + if (netmask) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("specifying netmask invalid for IPv6 address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (gateway && (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET6))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("family 'ipv6' specified for non-IPv6 gateway address '%s' in network '%s'"), + gateway, networkName); + goto cleanup; + } } else { virReportError(VIR_ERR_XML_ERROR, _("Unrecognized family '%s' in definition of network '%s'"), @@ -1241,16 +1298,55 @@ virNetworkIPDefParseXML(const char *networkName, } } + /* if static route gateway specified, make sure the address is a network address */ + if (gateway) { + if (def->prefix > 0) { + if (virSocketAddrMaskByPrefix(&def->address, def->prefix, &testAddr) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("error converting address '%s' with prefix=%u to network-address in network '%s'"), + address, def->prefix, networkName); + goto cleanup; + } + } + if (netmask) { + if (virSocketAddrMask(&def->address, &def->netmask, &testAddr) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("error converting address '%s' with netmask '%s' to network-address in network '%s'"), + address, netmask, networkName); + goto cleanup; + } + } + if (!virSocketAddrEqual(&def->address, &testAddr)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("address '%s' in network '%s' is not a network-address"), + address, networkName); + goto cleanup; + } + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "dhcp")) { + if (gateway) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<dhcp> element unsupported when static route (via) previously defined in network '%s'"), + networkName); + goto cleanup; + } if (virNetworkDHCPDefParseXML(networkName, cur, def) < 0) goto cleanup; } else if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "tftp")) { char *root; + if (gateway) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<tftp> element unsupported when static route (via) previously defined in network '%s'"), + networkName); + goto cleanup; + } + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported <tftp> element in an IPv6 element in network '%s'"), @@ -1274,6 +1370,7 @@ cleanup: } VIR_FREE(address); VIR_FREE(netmask); + VIR_FREE(gateway); ctxt->node = save; return result; @@ -1828,6 +1925,58 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; def->nips++; } + /* now validate the correctness of any static route gateways specified + * + * note: the parameters within each definition are varified/assumed valid; + * the question being asked and answered here is if the specified gateway + * address has a network definition on this bridge + */ + for (ii = 0; ii < nIps; ii++) { + int jj; + virSocketAddr testAddr, testGw; + bool addrMatch; + virNetworkIpDefPtr gwdef = &def->ips[ii]; + if (VIR_SOCKET_ADDR_VALID(&gwdef->gateway)) { + addrMatch = false; + for (jj = 0; jj < nIps; jj++) { + virNetworkIpDefPtr def2 = &def->ips[jj]; + if (VIR_SOCKET_ADDR_VALID(&def2->gateway)) + continue; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET6)) && + (!VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6))) + continue; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6)) && + (!VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET6))) + continue; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_UNSPEC)) && + VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6)) + continue; + if (def2->prefix > 0) { + virSocketAddrMaskByPrefix(&def2->address, def2->prefix, &testAddr); + virSocketAddrMaskByPrefix(&gwdef->gateway, def2->prefix, &testGw); + } + if (VIR_SOCKET_ADDR_VALID(&def2->netmask)) { + virSocketAddrMask(&def2->address, &def2->netmask, &testAddr); + virSocketAddrMask(&gwdef->gateway, &def2->netmask, &testGw); + } + if (VIR_SOCKET_ADDR_VALID(&testAddr) && + VIR_SOCKET_ADDR_VALID(&testGw) && + virSocketAddrEqual(&testAddr, &testGw)) { + addrMatch = true; + break; + } + } + if (!addrMatch) { + char *gw = virSocketAddrFormat(&gwdef->gateway); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid static route gateway specified: '%s'"), + gw); + VIR_FREE(gw); + goto error; + } + } + } } VIR_FREE(ipNodes); @@ -2108,6 +2257,7 @@ virNetworkIpDefFormat(virBufferPtr buf, const virNetworkIpDefPtr def) { int result = -1; + bool routeFlg = false; virBufferAddLit(buf, "<ip"); @@ -2131,15 +2281,29 @@ virNetworkIpDefFormat(virBufferPtr buf, if (def->prefix > 0) { virBufferAsprintf(buf," prefix='%u'", def->prefix); } + if (VIR_SOCKET_ADDR_VALID(&def->gateway)) { + char *addr = virSocketAddrFormat(&def->gateway); + if (!addr) + goto error; + routeFlg = true; + virBufferAsprintf(buf, " via='%s'", addr); + VIR_FREE(addr); + } virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); if (def->tftproot) { + if (routeFlg) /* this should not occur */ + goto error; /* but in case it does, better to error out */ virBufferEscapeString(buf, "<tftp root='%s' />\n", def->tftproot); } if ((def->nranges || def->nhosts)) { int ii; + + if (routeFlg) /* this should not occur */ + goto error; /* but in case it does, better to error out */ + virBufferAddLit(buf, "<dhcp>\n"); virBufferAdjustIndent(buf, 2); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 6ce9a00..91aff5f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -115,6 +115,8 @@ struct _virNetworkIpDef { char *family; /* ipv4 or ipv6 - default is ipv4 */ virSocketAddr address; /* Bridge IP address */ + virSocketAddr gateway; /* gateway IP address for ip-route */ + /* One or the other of the following two will be used for a given * IP address, but never both. The parser guarantees this. * Use virNetworkIpDefPrefix/virNetworkIpDefNetmask rather diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ed46479..988b97a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1470,6 +1470,7 @@ virNetDevReplaceMacAddress; virNetDevReplaceNetConfig; virNetDevRestoreMacAddress; virNetDevRestoreNetConfig; +virNetDevSetGateway; virNetDevSetIPv4Address; virNetDevSetMAC; virNetDevSetMTU; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 31c8585..07058f3 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2360,6 +2360,7 @@ out: return ret; } +/* add an IP address to a bridge */ static int networkAddAddrToBridge(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) @@ -2380,6 +2381,28 @@ networkAddAddrToBridge(virNetworkObjPtr network, return 0; } +/* add an IP route to a bridge */ +static int +networkAddRouteToBridge(virNetworkObjPtr network, + virNetworkIpDefPtr ipdef) +{ + int prefix = virNetworkIpDefPrefix(ipdef); + + if (prefix < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("bridge '%s' has an invalid netmask or IP address"), + network->def->bridge); + return -1; + } + + if (virNetDevSetGateway(network->def->bridge, + &ipdef->address, + prefix, + &ipdef->gateway) < 0) + return -1; + return 0; +} + static int networkStartNetworkVirtual(struct network_driver *driver, virNetworkObjPtr network) @@ -2446,9 +2469,12 @@ networkStartNetworkVirtual(struct network_driver *driver, if (networkAddIptablesRules(driver, network) < 0) goto err1; + /* first, do all of the addresses */ for (ii = 0; (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); ii++) { + if (VIR_SOCKET_ADDR_VALID(&ipdef->gateway)) + continue; /* this is a static route specification */ if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) v4present = true; if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) @@ -2464,6 +2490,22 @@ networkStartNetworkVirtual(struct network_driver *driver, if (virNetDevSetOnline(network->def->bridge, 1) < 0) goto err2; + /* then do all of the static routes */ + for (ii = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); + ii++) { + + /* Add the IP route to the bridge */ + /* ignore errors, error msg will be generated */ + /* but libvirt will not know and net-destroy will work. */ + if (VIR_SOCKET_ADDR_VALID(&ipdef->gateway)) { + if (networkAddRouteToBridge(network, ipdef) < 0) { + /* an error occurred adding the static route */ + continue; /* for now, do nothing */ + } + } + } + /* If forward.type != NONE, turn on global IP forwarding */ if (network->def->forward.type != VIR_NETWORK_FORWARD_NONE && networkEnableIpForwarding(v4present, v6present) < 0) { diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 296871c..c90b3d2 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -729,6 +729,7 @@ int virNetDevGetVLanID(const char *ifname ATTRIBUTE_UNUSED, * Add an IP address to an interface. This function *does not* remove * any previously added IP addresses - that must be done separately with * brDelInetAddress. + * TODO: what is "brDelInetAddress"? * * Returns 0 in case of success or -1 in case of error. */ @@ -769,6 +770,52 @@ cleanup: } /** + * virNetDevSetGateway: + * @ifname: the interface name + * @addr: the IP network address (IPv4 or IPv6) + * @prefix: number of 1 bits in the netmask + * @gateway: via address for route (same as @addr) + * + * Add a route for a network IP address to an interface. This function + * *does not* remove any previously added IP static routes. + * + * Returns 0 in case of success or -1 in case of error. + */ + +int virNetDevSetGateway(const char *ifname, + virSocketAddr *addr, + unsigned int prefix, + virSocketAddr *gateway) +{ + virCommandPtr cmd = NULL; + char *addrstr = NULL, *gatewaystr = NULL; + int ret = -1; + + if (!(addrstr = virSocketAddrFormat(addr))) + goto cleanup; + if (!(gatewaystr = virSocketAddrFormat(gateway))) + goto cleanup; + cmd = virCommandNew(IP_PATH); + virCommandAddArgList(cmd, "route", "add", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArgList(cmd, "via", NULL); + virCommandAddArgFormat(cmd, "%s", gatewaystr); + virCommandAddArgList(cmd, "dev", ifname, NULL); + virCommandAddArgList(cmd, "proto", "static", "metric", NULL); + virCommandAddArgFormat(cmd, "%u", 1); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(addrstr); + VIR_FREE(gatewaystr); + virCommandFree(cmd); + return ret; +} + +/** * virNetDevClearIPv4Address: * @ifname: the interface name * @addr: the IP address (IPv4 or IPv6) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 06d0650..8b94ea8 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -42,6 +42,11 @@ int virNetDevSetIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevSetGateway(const char *ifname, + virSocketAddr *addr, + unsigned int prefix, + virSocketAddr *gateway) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevClearIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) diff --git a/tests/networkxml2xmlin/dhcp6host-routed-network.xml b/tests/networkxml2xmlin/dhcp6host-routed-network.xml index 2693d87..dcad62d 100644 --- a/tests/networkxml2xmlin/dhcp6host-routed-network.xml +++ b/tests/networkxml2xmlin/dhcp6host-routed-network.xml @@ -19,4 +19,8 @@ <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24' /> </dhcp> </ip> + <ip address="192.168.222.0" netmask="255.255.255.0" via="192.168.122.10"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fc00::" prefix="64" via="2001:db8:ac10:fd01::1:24"> + </ip> </network> diff --git a/tests/networkxml2xmlout/dhcp6host-routed-network.xml b/tests/networkxml2xmlout/dhcp6host-routed-network.xml index 7305043..880c2dd 100644 --- a/tests/networkxml2xmlout/dhcp6host-routed-network.xml +++ b/tests/networkxml2xmlout/dhcp6host-routed-network.xml @@ -21,4 +21,8 @@ <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24' /> </dhcp> </ip> + <ip address='192.168.222.0' netmask='255.255.255.0' via='192.168.122.10'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fc00::' prefix='64' via='2001:db8:ac10:fd01::1:24'> + </ip> </network> -- 1.8.1.4

2 14

[libvirt] [PATCH v2] qemu: Set correct migrate host in client_migrate_info
by Michal Privoznik 11 Apr '13

11 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=920441 Currently, we are discarding listen attribute from qemu cookie even though we strive to gather it. This result in not so cool bug: if user have different networks, one for management/migration, and one for VNC/SPICE we pass incorrect host to the qemu in client_migrate_info. What we actually pass is remote hostname, while we should be passing remote listen address. It doesn't matter as long as these two are the same, but they don't need necessary to be like that. --- src/conf/domain_conf.c | 4 +++- src/qemu/qemu_migration.c | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e00a532..2afa982 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16557,8 +16557,10 @@ virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t ii) virDomainGraphicsListenDefPtr listenInfo = virDomainGraphicsGetListen(def, ii, false); + /* even a network can have a listen address */ if (!listenInfo || - (listenInfo->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS)) + !(listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || + listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK)) return NULL; return listenInfo->address; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 41ad768..434b19a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1720,6 +1720,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; + char *listenAddress = cookie->graphics->listen; if (!cookie) return 0; @@ -1733,12 +1734,15 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) return 0; + if (STREQ(listenAddress, "0.0.0.0")) + listenAddress = cookie->remoteHostname; + ret = qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, - cookie->remoteHostname, + listenAddress, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); -- 1.8.1.5

2 1

[libvirt] [PATCH] qemu: Set correct migrate host in client_migrate_info
by Michal Privoznik 11 Apr '13

11 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=920441 Currently, we are discarding listen attribute from qemu cookie even though we strive to gather it. This result in not so cool bug: if user have different networks, one for management/migration, and one for VNC/SPICE we pass incorrect host to the qemu in client_migrate_info. What we actually pass is remote hostname, while we should be passing remote listen address. It doesn't matter as long as these two are the same, but they don't need necessary to be like that. --- src/conf/domain_conf.c | 4 +++- src/qemu/qemu_migration.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e00a532..2afa982 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16557,8 +16557,10 @@ virDomainGraphicsListenGetAddress(virDomainGraphicsDefPtr def, size_t ii) virDomainGraphicsListenDefPtr listenInfo = virDomainGraphicsGetListen(def, ii, false); + /* even a network can have a listen address */ if (!listenInfo || - (listenInfo->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS)) + !(listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || + listenInfo->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK)) return NULL; return listenInfo->address; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 41ad768..089b75a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1738,7 +1738,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, - cookie->remoteHostname, + cookie->graphics->listen, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); -- 1.8.1.5

2 3

[libvirt] [PATCH 0/2] Add support for translations
by Daniel P. Berrange 10 Apr '13

10 Apr '13

libvirt-glib contains a bunch of user visible error message strings which need translation. These patches wire up the glib/intltool/gettext i18n framework I have created a transifex project to go with it https://www.transifex.com/projects/p/libvirt-glib/

3 8

Re: [libvirt] [Qemu-devel] GSoC 2013, "Introduce API to query IP addresses for given domain" Libvirt project
by Stefan Hajnoczi 10 Apr '13

10 Apr '13

On Wed, Apr 10, 2013 at 04:46:45AM +0200, Tabibel Sami wrote: > I am doing master degree of Cryptology and information security > I have good C and Python skills, and i am interested to work on > "Introduce API to query IP addresses for given domain" Libvirt > project. > > I am looking for any comment about the difficulty and the content of > the project, and also about my chances to be accepted if i apply for. Adding libvirt mailing list and CCing mprivozn who is the mentor for this project. Stefan

2 1