- Devel - libvirt List Archives

[libvirt] [PATCH] doc: fix incorrect option in send-key
by ajia＠redhat.com 08 Sep '11

08 Sep '11

From: Alex Jia <ajia(a)redhat.com> * tools/virsh.pod: fix a option typo of send-key section. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index d826997..e82567d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -356,7 +356,7 @@ The numeric values are those defined by the OS-X keyboard input subsystem. The symbolic names match the corresponding OS-X key constant macro names -=item B<xtkbd> +=item B<xt_kbd> The numeric values are those defined by the Linux KBD device. These are a variant on the original XT codeset, but often with -- 1.7.1

2 1

[libvirt] [PATCH] virsh: fix typo in opts_send_key
by ajia＠redhat.com 08 Sep '11

08 Sep '11

From: Alex Jia <ajia(a)redhat.com> * tools/virsh.c: millseconds should be milliseconds in opts_send_key. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0f00463..cf3e816 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4301,7 +4301,7 @@ static const vshCmdOptDef opts_send_key[] = { {"codeset", VSH_OT_STRING, VSH_OFLAG_REQ_OPT, N_("the codeset of keycodes, default:linux")}, {"holdtime", VSH_OT_INT, VSH_OFLAG_REQ_OPT, - N_("the time (in millseconds) how long the keys will be held")}, + N_("the time (in milliseconds) how long the keys will be held")}, {"keycode", VSH_OT_ARGV, VSH_OFLAG_REQ, N_("the key code")}, {NULL, 0, 0, NULL} }; -- 1.7.1

2 1

[libvirt] [PATCH 1/2] tests: avoid memory leak on testTLSSessionInit
by ajia＠redhat.com 08 Sep '11

08 Sep '11

* tests/virnettlscontexttest: fix memory leak on virnettlscontext test case. * Detected in valgrind run: ==25667== ==25667== 86,651 (34,680 direct, 51,971 indirect) bytes in 10 blocks are definitely lost in loss record 350 of 351 ==25667== at 0x4005447: calloc (vg_replace_malloc.c:467) ==25667== by 0x4F1F515D: gnutls_init (gnutls_state.c:270) ==25667== by 0x8053432: virNetTLSSessionNew (virnettlscontext.c:1181) ==25667== by 0x804DD24: testTLSSessionInit (virnettlscontexttest.c:624) ==25667== by 0x804F14D: virtTestRun (testutils.c:140) ==25667== ==25667== 100,578 (38,148 direct, 62,430 indirect) bytes in 11 blocks are definitely lost in loss record 351 of 351 ==25667== at 0x4005447: calloc (vg_replace_malloc.c:467) ==25667== by 0x4F1F515D: gnutls_init (gnutls_state.c:270) ==25667== by 0x8053432: virNetTLSSessionNew (virnettlscontext.c:1181) ==25667== by 0x804DD3C: testTLSSessionInit (virnettlscontexttest.c:625) ==25667== by 0x804F14D: virtTestRun (testutils.c:140) * How to reproduce? % cd libvirt && ./configure && make && make -C tests valgrind or % valgrind -v --leak-check=full ./tests/virnettlscontexttest Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tests/virnettlscontexttest.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index ee7b6b4..ece611a 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -712,6 +712,8 @@ static int testTLSSessionInit(const void *opaque) cleanup: virNetTLSContextFree(serverCtxt); virNetTLSContextFree(clientCtxt); + virNetTLSSessionFree(serverSess); + virNetTLSSessionFree(clientSess); gnutls_x509_crt_deinit(data->careq.crt); if (data->othercareq.filename) gnutls_x509_crt_deinit(data->othercareq.crt); -- 1.7.5.1

2 3

[libvirt] [PATCH] libxl: avoid a dereference of a null pointer
by ajia＠redhat.com 08 Sep '11

08 Sep '11

Variable 'l_disk' initialized to a null pointer value, control jumps to 'case VIR_DOMAIN_DISK_DEVICE_DISK and then taking false branch, Within the expansion of the macro 'libxlError': Field access results in a dereference of a null pointer (loaded from variable 'l_disk'). * src/libxl/libxl_driver.c: Field access results in a dereference of a null pointer (loaded from variable 'l_disk') Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/libxl/libxl_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 91da438..bbc3059 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3016,7 +3016,7 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv, } else { libxlError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk bus '%s' cannot be hot unplugged."), - virDomainDiskBusTypeToString(l_disk->bus)); + virDomainDiskBusTypeToString(dev->data.disk->bus)); } break; default: -- 1.7.5.1

3 2

[libvirt] [PATCH] qemu: Search for disk in qemuDomainGetBlockInfo
by Michal Privoznik 08 Sep '11

08 Sep '11

The commit 89b6284fd94ce5b13ee6b002f9167f5d9074aa7a caused regression. Although we now allow users to input e.g. 'hda' instead of whole path, we still need to search for appropriate disk in VM definition. --- src/qemu/qemu_driver.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1925ba5..fec4eeb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7755,6 +7755,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, virStorageFileMetadata *meta = NULL; virDomainDiskDefPtr disk = NULL; struct stat sb; + int i; int format; const char *actual; @@ -7785,6 +7786,21 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, } path = actual; + /* Check the path belongs to this domain. */ + for (i = 0 ; i < vm->def->ndisks ; i++) { + if (vm->def->disks[i]->src != NULL && + STREQ (vm->def->disks[i]->src, path)) { + disk = vm->def->disks[i]; + break; + } + } + + if (!disk) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("invalid path %s not assigned to domain"), path); + goto cleanup; + } + /* The path is correct, now try to open it and get its size. */ fd = open(path, O_RDONLY); if (fd == -1) { -- 1.7.3.4

2 4

[libvirt] [PATCH] esx: Fix managed object lookup with optional occurrence
by Matthias Bolte 08 Sep '11

08 Sep '11

Exit early if managed object is not found, instead of dereferencing a NULL pointer and triggering a segfault. --- src/esx/esx_vi.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5c8d79e..f4033eb 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3964,7 +3964,7 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio #define ESX_VI__TEMPLATE__LOOKUP(_type, _complete_properties, \ - _cast_from_anytype) \ + _cast_from_anytype) \ int \ esxVI_Lookup##_type(esxVI_Context *ctx, const char* name /* optional */, \ esxVI_ManagedObjectReference *root, \ @@ -3999,6 +3999,12 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio goto cleanup; \ } \ \ + if (objectContent == NULL) { \ + /* not found, exit early */ \ + result = 0; \ + goto cleanup; \ + } \ + \ if (esxVI_##_type##_Alloc(ptrptr) < 0) { \ goto cleanup; \ } \ -- 1.7.4.1

2 2

[libvirt] [PATCH v3] virsh: Add more human-friendly output of domblkstat command
by Peter Krempa 07 Sep '11

07 Sep '11

Users of virsh complain that output of the domblkstat command is not intuitive enough. This patch adds explanation of fields returned by this command to the help section for domblkstat and the man page of virsh. Also a switch --human is added for domblkstat that prints the fields with more descriptive texts. https://bugzilla.redhat.com/show_bug.cgi?id=731656 Changes to v2: - Modify for new fields in virDomainBlockStatsFlags Changes to v1: - Rebase to current head --- tools/virsh.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++-------- tools/virsh.pod | 16 +++++++- 2 files changed, 112 insertions(+), 18 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 629233f..458252b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1054,16 +1054,46 @@ cleanup: */ static const vshCmdInfo info_domblkstat[] = { {"help", N_("get device block stats for a domain")}, - {"desc", N_("Get device block stats for a running domain.")}, + {"desc", N_("Get device block stats for a running domain.\n\n" + " Explanation of fields:\n" + " rd_req - count of read operations (old format)\n" + " rd_operations - count of read operations (new format)\n" + " rd_bytes - count of read bytes\n" + " rd_total_times - total time read operations took\n" + " wr_req - count of write operations (old format)\n" + " wr_operations - count of write operations (new format)\n" + " wr_bytes - count of written bytes\n" + " flush_operations - count of flush operations\n" + " flush_total_times - total time flush operations took\n" + " errs - error count")}, {NULL,NULL} }; static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, {NULL, 0, 0, NULL} }; +struct _domblkstat_human_readable { + const char *field; + const char *human; +}; + +static const struct _domblkstat_human_readable domblkstat_translate[] = { + { VIR_DOMAIN_BLOCK_STATS_READ_BYTES, N_("number of read bytes: ") }, /* 0 */ + { VIR_DOMAIN_BLOCK_STATS_READ_REQ, N_("number of read operations: ") }, /* 1 */ + { VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES, N_("total duration of reads: ") }, /* 2 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, N_("number of bytes written: ") }, /* 3 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, N_("number of write operations:") }, /* 4 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES, N_("total duration of writes: ") }, /* 5 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ, N_("number of flush operations:") }, /* 6 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_TOTAL_TIMES, N_("total duration of flushes: ") }, /* 7 */ + { VIR_DOMAIN_BLOCK_STATS_ERRS, N_("error count: ") }, /* 8 */ + { NULL, NULL } +}; + static bool cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) { @@ -1071,8 +1101,11 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; virTypedParameterPtr params = NULL; + const char *field_name = NULL; + int j = 0; int rc, nparams = 0; bool ret = false; + bool human = vshCommandOptBool(cmd, "human"); /* enable human readable output */ if (!vshConnectionUsability (ctl, ctl->conn)) return false; @@ -1104,20 +1137,41 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (stats.rd_req >= 0) - vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + if (human) { + /* human friendly output */ + vshPrint(ctl, N_("Device: %s\n"), device); + + if (stats.rd_req >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_translate[1].human, stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_translate[0].human, stats.rd_bytes); + + if (stats.wr_req >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_translate[4].human, stats.wr_req); + + if (stats.wr_bytes >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_translate[3].human, stats.wr_bytes); + + if (stats.errs >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_translate[8].human, stats.errs); + } else { + + if (stats.rd_req >= 0) + vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); - if (stats.rd_bytes >= 0) - vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); + if (stats.rd_bytes >= 0) + vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); - if (stats.wr_req >= 0) - vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); + if (stats.wr_req >= 0) + vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); - if (stats.wr_bytes >= 0) - vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + if (stats.wr_bytes >= 0) + vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); - if (stats.errs >= 0) - vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + if (stats.errs >= 0) + vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + } } } else { params = vshMalloc(ctl, sizeof(*params) * nparams); @@ -1129,32 +1183,58 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) } int i; + + /* set for prettier output */ + if (human) { + vshPrint(ctl, N_("Device: %s\n"), device); + device = ""; + } + /* XXX: The output sequence will be different. */ for (i = 0; i < nparams; i++) { + /* translate messages into a human readable form, if requested */ + if (human) { + /* try to look up the translation into a more human readable form */ + field_name = NULL; + for (j = 0; domblkstat_translate[j].field != NULL; j++) { + if (STREQ(params[i].field, domblkstat_translate[j].field)) { + field_name = domblkstat_translate[j].human; + + break; + } + } + + /* translation not found, stick with the default field name */ + if (!field_name) + field_name = params[i].field; + } else { + field_name = params[i].field; + } + switch(params[i].type) { case VIR_TYPED_PARAM_INT: vshPrint (ctl, "%s %s %d\n", device, - params[i].field, params[i].value.i); + field_name, params[i].value.i); break; case VIR_TYPED_PARAM_UINT: vshPrint (ctl, "%s %s %u\n", device, - params[i].field, params[i].value.ui); + field_name, params[i].value.ui); break; case VIR_TYPED_PARAM_LLONG: vshPrint (ctl, "%s %s %lld\n", device, - params[i].field, params[i].value.l); + field_name, params[i].value.l); break; case VIR_TYPED_PARAM_ULLONG: vshPrint (ctl, "%s %s %llu\n", device, - params[i].field, params[i].value.ul); + field_name, params[i].value.ul); break; case VIR_TYPED_PARAM_DOUBLE: vshPrint (ctl, "%s %s %f\n", device, - params[i].field, params[i].value.d); + field_name, params[i].value.d); break; case VIR_TYPED_PARAM_BOOLEAN: vshPrint (ctl, "%s %s %s\n", device, - params[i].field, params[i].value.b ? _("yes") : _("no")); + field_name, params[i].value.b ? _("yes") : _("no")); break; default: vshError(ctl, _("unimplemented block statistics parameter type")); diff --git a/tools/virsh.pod b/tools/virsh.pod index d826997..c8d88c9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -501,13 +501,27 @@ be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. -=item B<domblkstat> I<domain> I<block-device> +=item B<domblkstat> I<domain> I<block-device> [I<--human>] Get device block stats for a running domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to I<domain> (see also B<domblklist> for listing these names). +Use I<--human> for a more human readable output. + +B<Explanation of fields:> + rd_req - count of read operations (old format) + rd_operations - count of read operations (new format) + rd_bytes - count of read bytes + rd_total_times - total time read operations took + wr_req - count of write operations (old format) + wr_operations - count of write operations (new format) + wr_bytes - count of written bytes + flush_operations - count of flush operations + flush_total_times - total time flush operations took + errs - error count + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.3.4

2 3

[libvirt] [PATCH] Threadpool: Initialize new dynamic workers
by Michal Privoznik 07 Sep '11

07 Sep '11

Although we were initializing worker threads during pool creating, we missed this during virThreadPoolSendJob. This bug led to segmenation fault as worker thread free() given argument. --- src/util/threadpool.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/util/threadpool.c b/src/util/threadpool.c index 70a75c0..6210b00 100644 --- a/src/util/threadpool.c +++ b/src/util/threadpool.c @@ -286,6 +286,7 @@ int virThreadPoolSendJob(virThreadPoolPtr pool, void *jobData) { virThreadPoolJobPtr job; + struct virThreadPoolWorkerData *data = NULL; virMutexLock(&pool->mutex); if (pool->quit) @@ -298,10 +299,19 @@ int virThreadPoolSendJob(virThreadPoolPtr pool, goto error; } + if (VIR_ALLOC(data) < 0) { + pool->nWorkers--; + virReportOOMError(); + goto error; + } + + data->pool = pool; + data->cond = &pool->cond; + if (virThreadCreate(&pool->workers[pool->nWorkers - 1], true, virThreadPoolWorker, - pool) < 0) { + data) < 0) { pool->nWorkers--; goto error; } @@ -336,6 +346,7 @@ int virThreadPoolSendJob(virThreadPoolPtr pool, return 0; error: + VIR_FREE(data); virMutexUnlock(&pool->mutex); return -1; } -- 1.7.3.4

2 2

[libvirt] [test-API][PATCH] unify similar types of the test file name in repos
by Nan Zhang 07 Sep '11

07 Sep '11

--- repos/domain/blkstats.py | 103 --------------------------------------- repos/domain/domain_blkstats.py | 103 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 repos/domain/blkstats.py create mode 100644 repos/domain/domain_blkstats.py diff --git a/repos/domain/blkstats.py b/repos/domain/blkstats.py deleted file mode 100644 index 67592f0..0000000 --- a/repos/domain/blkstats.py +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/evn python -"""this test case is used for testing domain block - device statistics - mandatory arguments: guestname -""" - -__author__ = 'Alex Jia: ajia(a)redhat.com' -__date__ = 'Wed Jan 27, 2010' -__version__ = '0.1.0' -__credits__ = 'Copyright (C) 2009 Red Hat, Inc.' -__all__ = ['usage', 'check_guest_status', 'check_blkstats', - 'blkstats'] - -import os -import sys -import time - -dir = os.path.dirname(sys.modules[__name__].__file__) -absdir = os.path.abspath(dir) -rootdir = os.path.split(os.path.split(absdir)[0])[0] -sys.path.append(rootdir) - -import exception -from lib import connectAPI -from lib import domainAPI -from utils.Python import utils - -def usage(params): - """Verify inputing parameter dictionary""" - logger = params['logger'] - keys = ['guestname'] - for key in keys: - if key not in params: - logger.error("%s is required" %key) - return 1 - -def check_guest_status(guestname, domobj): - """Check guest current status""" - state = domobj.get_state(guestname) - if state == "shutoff" or state == "shutdown": - # add check function - return False - else: - return True - -def check_blkstats(): - """Check block device statistic result""" - pass - -def blkstats(params): - """Domain block device statistic""" - # Initiate and check parameters - usage(params) - logger = params['logger'] - guestname = params['guestname'] - test_result = False - - # Connect to local hypervisor connection URI - util = utils.Utils() - uri = util.get_uri('127.0.0.1') - conn = connectAPI.ConnectAPI() - virconn = conn.open(uri) - - caps = conn.get_caps() - logger.debug(caps) - - # Check domain block status - domobj = domainAPI.DomainAPI(virconn) - if check_guest_status(guestname, domobj): - pass - else: - domobj.start(guestname) - time.sleep(90) - try: - try: - (blkstats, path) = domobj.get_block_stats(guestname) - except exception.LibvirtAPI, e: - logger.error("libvirt error: error code - %s; error message - %s" %(e.code, e.message)) - return 1; - finally: - conn.close() - logger.info("closed hypervisor connection") - - if blkstats: - # check_blkstats() - logger.debug(blkstats) - logger.info("%s rd_req %s" %(path, blkstats[0])) - logger.info("%s rd_bytes %s" %(path, blkstats[1])) - logger.info("%s wr_req %s" %(path, blkstats[2])) - logger.info("%s wr_bytes %s" %(path, blkstats[3])) - test_result = True - else: - logger.error("fail to get domain block statistics\n") - test_result = False - - if test_result: - return 0 - else: - return 1 - -def blkstats_clean(params): - """ clean testing environment """ - pass diff --git a/repos/domain/domain_blkstats.py b/repos/domain/domain_blkstats.py new file mode 100644 index 0000000..79ea99a --- /dev/null +++ b/repos/domain/domain_blkstats.py @@ -0,0 +1,103 @@ +#!/usr/bin/evn python +"""this test case is used for testing domain block + device statistics + mandatory arguments: guestname +""" + +__author__ = 'Alex Jia: ajia(a)redhat.com' +__date__ = 'Wed Jan 27, 2010' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2009 Red Hat, Inc.' +__all__ = ['usage', 'check_guest_status', 'check_blkstats', + 'blkstats'] + +import os +import sys +import time + +dir = os.path.dirname(sys.modules[__name__].__file__) +absdir = os.path.abspath(dir) +rootdir = os.path.split(os.path.split(absdir)[0])[0] +sys.path.append(rootdir) + +import exception +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils + +def usage(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + return 1 + +def check_guest_status(guestname, domobj): + """Check guest current status""" + state = domobj.get_state(guestname) + if state == "shutoff" or state == "shutdown": + # add check function + return False + else: + return True + +def check_blkstats(): + """Check block device statistic result""" + pass + +def domain_blkstats(params): + """Domain block device statistic""" + # Initiate and check parameters + usage(params) + logger = params['logger'] + guestname = params['guestname'] + test_result = False + + # Connect to local hypervisor connection URI + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + caps = conn.get_caps() + logger.debug(caps) + + # Check domain block status + domobj = domainAPI.DomainAPI(virconn) + if check_guest_status(guestname, domobj): + pass + else: + domobj.start(guestname) + time.sleep(90) + try: + try: + (blkstats, path) = domobj.get_block_stats(guestname) + except exception.LibvirtAPI, e: + logger.error("libvirt error: error code - %s; error message - %s" %(e.code, e.message)) + return 1; + finally: + conn.close() + logger.info("closed hypervisor connection") + + if blkstats: + # check_blkstats() + logger.debug(blkstats) + logger.info("%s rd_req %s" %(path, blkstats[0])) + logger.info("%s rd_bytes %s" %(path, blkstats[1])) + logger.info("%s wr_req %s" %(path, blkstats[2])) + logger.info("%s wr_bytes %s" %(path, blkstats[3])) + test_result = True + else: + logger.error("fail to get domain block statistics\n") + test_result = False + + if test_result: + return 0 + else: + return 1 + +def domain_blkstats_clean(params): + """ clean testing environment """ + pass -- 1.7.4.4

2 1

[libvirt] [test-API][PATCH] Add test case for start domain on nfs storage
by Wayne Sun 07 Sep '11

07 Sep '11

* This test is for start a domain with img file on nfs storage. Under SElinux boolean virt_use_nfs on or off, combine with setting the dynamic_ownership in /etc/libvirt/qemu.conf, check whether the guest can be started or not. The nfs could be root_squash or no_root_squash. SElinux should be enabled and enforcing on host. --- repos/sVirt/domain_nfs_start.py | 476 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 476 insertions(+), 0 deletions(-) create mode 100644 repos/sVirt/__init__.py create mode 100644 repos/sVirt/domain_nfs_start.py diff --git a/repos/sVirt/__init__.py b/repos/sVirt/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py new file mode 100644 index 0000000..0b66128 --- /dev/null +++ b/repos/sVirt/domain_nfs_start.py @@ -0,0 +1,476 @@ +#!/usr/bin/env python +"""This test is for start a guest with img file on nfs storage. + Under SElinux boolean virt_use_nfs on or off, combine with + setting the dynamic_ownership in /etc/libvirt/qemu.conf, + check whether the guest can be started or not. The nfs could + be root_squash or no_root_squash. SElinux should be enabled + and enforcing on host. + sVirt:domain_nfs_start + guestname + #GUESTNAME# + dynamic_ownership + enable|disable + virt_use_nfs + on|off + root_squash + yes|no +""" + +__author__ = 'Wayne Sun: gsun(a)redhat.com' +__date__ = 'Mon Sep 2, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['domain_nfs_start'] + +import os +import re +import sys + +QEMU_CONF = "/etc/libvirt/qemu.conf" + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from exception import LibvirtAPI + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +def return_close(conn, logger, ret): + """close hypervisor connection and return the given value""" + conn.close() + logger.info("closed hypervisor connection") + return ret + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'dynamic_ownership', 'virt_use_nfs', 'root_squash'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + return 1 + return 0 + +def nfs_setup(util, root_squash, logger): + """setup nfs on localhost + """ + logger.info("set nfs service") + if root_squash == "yes": + option = "root_squash" + elif root_squash == "no": + option = "no_root_squash" + + cmd = "echo /tmp *$rw,%s$ >> /etc/exports" % option + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to config nfs export") + return 1 + + logger.info("restart nfs service") + cmd = "service nfs restart" + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to restart nfs service") + return 1 + else: + for i in range(len(out)): + logger.info(out[i]) + + return 0 + +def prepare_env(util, d_ownership, virt_use_nfs, guestname, root_squash, \ + disk_file, img_dir, logger): + """set virt_use_nfs SElinux boolean, configure + dynamic_ownership in /etc/libvirt/qemu.conf + """ + logger.info("set virt_use_nfs selinux boolean") + cmd = "setsebool virt_use_nfs %s" % virt_use_nfs + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to set virt_use_nfs SElinux boolean") + return 1 + + logger.info("set the dynamic ownership in %s as %s" % \ + (QEMU_CONF, d_ownership)) + if d_ownership == "enable": + option = 1 + elif d_ownership == "disable": + option = 0 + set_cmd = "echo dynamic_ownership = %s >> %s" % \ + (option, QEMU_CONF) + ret, out = util.exec_cmd(set_cmd, shell=True) + if ret: + logger.error("failed to set dynamic ownership") + return 1 + + logger.info("restart libvirtd") + restart_cmd = "service libvirtd restart" + ret, out = util.exec_cmd(restart_cmd, shell=True) + if ret: + logger.error("failed to restart libvirtd") + for i in range(len(out)): + logger.info(out[i]) + return 1 + else: + for i in range(len(out)): + logger.info(out[i]) + + logger.info("copy %s img file to nfs path" %guestname) + cmd = "cp %s /tmp" % disk_file + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to cp %s img file to nfs path" % guestname) + return 1 + + logger.info("set up nfs service on localhost") + ret = nfs_setup(util, root_squash, logger) + if ret: + return 1 + + logger.info("mount nfs to img dir path") + mount_cmd = "mount -o vers=3 127.0.0.1:/tmp %s" % img_dir + ret, out = util.exec_cmd(mount_cmd, shell=True) + if ret: + logger.error("Failed to mount the nfs path") + for i in range(len(out)): + logger.info(out[i]) + return 1 + + return 0 + +def domain_nfs_start(params): + """start domain with img on nfs""" + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + + logger = params['logger'] + guestname = params['guestname'] + dynamic_ownership = params['dynamic_ownership'] + virt_use_nfs = params['virt_use_nfs'] + root_squash = params['root_squash'] + + util = utils.Utils() + + # Connect to local hypervisor connection URI + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + domobj = domainAPI.DomainAPI(virconn) + + logger.info("get the domain state") + try: + state = domobj.get_state(guestname) + logger.info("domain %s is %s" % (guestname, state)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to get domain %s state" % guestname) + return return_close(conn, logger, 1) + + if state != "shutoff": + logger.info("shut down the domain %s" % guestname) + try: + domobj.destroy(guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to destroy domain %s" % guestname) + return return_close(conn, logger, 1) + + logger.info("get guest img file path") + try: + dom_xml = domobj.get_xml_desc(guestname) + disk_file = util.get_disk_path(dom_xml) + logger.info("%s disk file path is %s" % (guestname, disk_file)) + img_dir = os.path.dirname(disk_file) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to get domain %s xml" % guestname) + return return_close(conn, logger, 1) + + # set env + logger.info("prepare the environment") + ret = prepare_env(util, dynamic_ownership, virt_use_nfs, guestname,\ + root_squash, disk_file, img_dir, logger) + if ret: + logger.error("failed to prepare the environment") + return return_close(conn, logger, 1) + + # some operation cause the connection broke, so reconnect here. Unsure the + # reason, need fix on this + conn.close() + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + domobj = domainAPI.DomainAPI(virconn) + + logger.info("begin to test start domain from nfs storage") + logger.info("First, start the domain without chown the img file to qemu") + logger.info("start domain %s" % guestname) + if root_squash == "yes": + if virt_use_nfs == "on": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + elif virt_use_nfs == "off": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + elif root_squash == "no": + if virt_use_nfs == "on": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.info("Success start domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + elif virt_use_nfs == "off": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + logger.info("get the domain state") + try: + state = domobj.get_state(guestname) + logger.info("domain %s is %s" % (guestname, state)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to get domain %s state" % guestname) + return return_close(conn, logger, 1) + + if state != "shutoff": + logger.info("shut down the domain %s" % guestname) + try: + domobj.destroy(guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to destroy domain %s" % guestname) + return return_close(conn, logger, 1) + + logger.info("Second, start the domain after chown the img file to qemu") + + file_name = os.path.basename(disk_file) + filepath = "/tmp/%s" % file_name + logger.info("set chown of %s as 107:107" % filepath) + chown_cmd = "chown 107:107 %s" % filepath + ret, out = util.exec_cmd(chown_cmd, shell=True) + if ret: + logger.error("failed to chown %s to qemu:qemu" % filepath) + return return_close(conn, logger, 1) + + logger.info("start domain %s" % guestname) + if root_squash == "yes": + if virt_use_nfs == "on": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.info("Success start domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.info("Success start domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif virt_use_nfs == "off": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + elif root_squash == "no": + if virt_use_nfs == "on": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.info("Success start domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.info("Success start Domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif virt_use_nfs == "off": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + return return_close(conn, logger, 0) + +def domain_nfs_start_clean(params): + """clean testing environment""" + logger = params['logger'] + guestname = params['guestname'] + + util = utils.Utils() + + # Connect to local hypervisor connection URI + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + domobj = domainAPI.DomainAPI(virconn) + + if domobj.get_state(guestname) != "shutoff": + domobj.destroy(guestname) + + dom_xml = domobj.get_xml_desc(guestname) + disk_file = util.get_disk_path(dom_xml) + img_dir = os.path.dirname(disk_file) + file_name = os.path.basename(disk_file) + temp_file = "/tmp/%s" % file_name + + umount_cmd = "umount -f %s" % img_dir + ret, out = util.exec_cmd(umount_cmd, shell=True) + if ret: + logger.error("failed to umount %s" % img_dir) + + if os.path.exists(temp_file): + os.remove(temp_file) + + conn.close() + -- 1.7.1

2 1

[libvirt] [PATCH v1] domain_conf: add the support for disk I/O throttle setting
by Zhi Yong Wu 07 Sep '11

07 Sep '11

The first patch is only used to see if it is suitable for exteeding blkiotune to implement disk I/O throttling. As you have known, when blkiotune is issued without options, it will display current tuning parameters; If we exceed it, without options, what should it display? both info will? or should one new option be added to separately display them? Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 11 +++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cce9955..d9108fa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2225,6 +2225,7 @@ cleanup: static virDomainDiskDefPtr virDomainDiskDefParseXML(virCapsPtr caps, xmlNodePtr node, + xmlXPathContextPtr ctxt, virBitmapPtr bootMap, unsigned int flags) { @@ -2266,7 +2267,9 @@ virDomainDiskDefParseXML(virCapsPtr caps, } cur = node->children; + xmlNodePtr oldnode = ctxt->node; while (cur != NULL) { + ctxt->node = cur; if (cur->type == XML_ELEMENT_NODE) { if ((source == NULL && hosts == NULL) && (xmlStrEqual(cur->name, BAD_CAST "source"))) { @@ -2362,6 +2365,36 @@ virDomainDiskDefParseXML(virCapsPtr caps, iotag = virXMLPropString(cur, "io"); ioeventfd = virXMLPropString(cur, "ioeventfd"); event_idx = virXMLPropString(cur, "event_idx"); + } else if (xmlStrEqual(cur->name, BAD_CAST "blkiothrottle")) { + if (virXPathULongLong("string(./blkiothrottle/bps)", ctxt, + &def->blkiothrottle.bps) < 0) { + def->blkiothrottle.bps = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/bps_rd)", ctxt, + &def->blkiothrottle.bps_rd) < 0) { + def->blkiothrottle.bps_rd = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/bps_wr)", ctxt, + &def->blkiothrottle.bps_wr) < 0) { + def->blkiothrottle.bps_wr = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/iops)", ctxt, + &def->blkiothrottle.iops) < 0) { + def->blkiothrottle.iops = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/iops_rd)", ctxt, + &def->blkiothrottle.iops_rd) < 0) { + def->blkiothrottle.iops_rd = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/iops_wr)", ctxt, + &def->blkiothrottle.iops_wr) < 0) { + def->blkiothrottle.iops_wr = 0; + } } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -2387,6 +2420,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, } cur = cur->next; } + ctxt->node = oldnode; device = virXMLPropString(node, "device"); if (device) { @@ -5684,9 +5718,13 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, if (xmlStrEqual(node->name, BAD_CAST "disk")) { dev->type = VIR_DOMAIN_DEVICE_DISK; - if (!(dev->data.disk = virDomainDiskDefParseXML(caps, node, - NULL, flags))) + xmlNodePtr oldnode = ctxt->node; + if (!(dev->data.disk = virDomainDiskDefParseXML(caps, node, ctxt, + NULL, flags))) { + ctxt->node = oldnode; goto error; + } + ctxt->node = oldnode; } else if (xmlStrEqual(node->name, BAD_CAST "lease")) { dev->type = VIR_DOMAIN_DEVICE_LEASE; if (!(dev->data.lease = virDomainLeaseDefParseXML(node))) @@ -6725,11 +6763,16 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } if (n && VIR_ALLOC_N(def->disks, n) < 0) goto no_memory; + + xmlNodePtr oldnode = ctxt->node; for (i = 0 ; i < n ; i++) { + ctxt->node = nodes[i]; virDomainDiskDefPtr disk = virDomainDiskDefParseXML(caps, nodes[i], + ctxt, bootMap, flags); + ctxt->node = oldnode; if (!disk) goto error; @@ -9065,6 +9108,29 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <target dev='%s' bus='%s'/>\n", def->dst, bus); + /*disk I/O throttling*/ + if (def->blkio.blkiothrottle.bps + || def->blkio.blkiothrottle.bps_rd + || def->blkio.blkiothrottle.bps_wr + || def->blkio.blkiothrottle.iops + || def->blkio.blkiothrottle.iops_rd + || def->blkio.blkiothrottle.iops_wr) { + virBufferAsprintf(&buf, " <blkiothrottle>\n"); + virBufferAsprintf(&buf, " <bps>%llu</bps>\n", + def->blkiothrottle.bps); + virBufferAsprintf(&buf, " <bps_rd>%llu</bps_rd>\n", + def->blkiothrottle.bps_rd); + virBufferAsprintf(&buf, " <bps_wr>%llu</bps_wr>\n", + def->blkiothrottle.bps_wr); + virBufferAsprintf(&buf, " <iops>%llu</iops>\n", + def->blkiothrottle.iops); + virBufferAsprintf(&buf, " <iops_rd>%llu</iops_rd>\n", + def->blkiothrottle.iops_rd); + virBufferAsprintf(&buf, " <iops_wr>%llu</iops_wr>\n", + def->blkiothrottle.iops_wr); + virBufferAsprintf(&buf, " </blkiothrottle>\n"); + } + if (def->bootIndex) virBufferAsprintf(buf, " <boot order='%d'/>\n", def->bootIndex); if (def->readonly) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e218a30..5902377 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -258,6 +258,17 @@ struct _virDomainDiskDef { virDomainDiskHostDefPtr hosts; char *driverName; char *driverType; + + /*disk I/O throttling*/ + struct { + unsigned long long bps; + unsigned long long bps_rd; + unsigned long long bps_wr; + unsigned long long iops; + unsigned long long iops_rd; + unsigned long long iops_wr; + } blkiothrottle; + char *serial; int cachemode; int error_policy; -- 1.7.6

1 0

[libvirt] [PATCH v1] domain_conf: add the support for disk I/O throttle setting
by Zhi Yong Wu 07 Sep '11

07 Sep '11

The first patch is only used to see if it is suitable for exteeding blkiotune to implement disk I/O throttling. As you have known, when blkiotune is issued without options, it will display current tuning parameters; If we exceed it, without options, what should it display? both info will? or should one new option be added to separately display them? Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 18 ++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cce9955..7dd350a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9065,6 +9065,24 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <target dev='%s' bus='%s'/>\n", def->dst, bus); + /*disk I/O throttling*/ + if (def->blkio.blkiothrottle) { + virBufferAsprintf(&buf, " <blkiothrottle>\n"); + virBufferAsprintf(&buf, " <bps>%llu</bps>\n", + def->blkiothrottle.bps); + virBufferAsprintf(&buf, " <bps_rd>%llu</bps_rd>\n", + def->blkiothrottle.bps_rd); + virBufferAsprintf(&buf, " <bps_wr>%llu</bps_wr>\n", + def->blkiothrottle.bps_wr); + virBufferAsprintf(&buf, " <iops>%llu</iops>\n", + def->blkiothrottle.iops); + virBufferAsprintf(&buf, " <iops_rd>%llu</iops_rd>\n", + def->blkiothrottle.iops_rd); + virBufferAsprintf(&buf, " <iops_wr>%llu</iops_wr>\n", + def->blkiothrottle.iops_wr); + virBufferAsprintf(&buf, " </blkiothrottle>\n"); + } + if (def->bootIndex) virBufferAsprintf(buf, " <boot order='%d'/>\n", def->bootIndex); if (def->readonly) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e218a30..5902377 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -258,6 +258,17 @@ struct _virDomainDiskDef { virDomainDiskHostDefPtr hosts; char *driverName; char *driverType; + + /*disk I/O throttling*/ + struct { + unsigned long long bps; + unsigned long long bps_rd; + unsigned long long bps_wr; + unsigned long long iops; + unsigned long long iops_rd; + unsigned long long iops_wr; + } blkiothrottle; + char *serial; int cachemode; int error_policy; -- 1.7.6

1 1

[libvirt] [RFC] netlink monitor thread
by D. Herrendoerfer 07 Sep '11

07 Sep '11

Hello, I'm trying to get libvirt to recognize port profile disassociations, i.e. when the switch removes a port profile because lldpad has unexpectedly quit or the profile has been changed in the switches profile database, or when something went wrong otherwise. My take on this for testing was to have an external deamon log port profiles and changes to them, and tell lldpad to set them again if needed. But this is not really practical. I would like to find a way to have the libvitrd monitor netlink and take appropriate measures if, for example, a port profile is removed unexpectedly, that is: to call the VMs network setup again if macvtap/VEPA is used. There would be other benefits, like the detection if a link goes down on a used interface, or a device is unexpectedly configured down by another component. Looking at the deamon code I'm unclear on how to do this properly, this is a very linux specific thing, and the asynchronous nature of the request handling makes starting the monitor thread later on difficult. Thoughts, ideas ? D. Herrendoerfer

1 0

[libvirt] [PATCH] Add test case update_devflag.py for update device flag
by Nan Zhang 07 Sep '11

07 Sep '11

--- repos/domain/update_devflag.py | 163 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) create mode 100644 repos/domain/update_devflag.py diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py new file mode 100644 index 0000000..30f75b0 --- /dev/null +++ b/repos/domain/update_devflag.py @@ -0,0 +1,163 @@ +#!/usr/bin/evn python +"""Update virtual device to guest from an XML file +""" + +__author__ = 'Nan Zhang: nzhang(a)redhat.com' +__date__ = 'Fri Sep 2, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['usage', 'update_devflag'] + +import os +import re +import sys +import commands +from xml.dom import minidom + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from utils.Python import xmlbuilder +from exception import LibvirtAPI + +def usage(): + print '''usage: mandatory arguments: + guestname + devtype + ''' + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'devtype'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + usage() + return 1 + return 0 + +def create_image(params, img_name, img_size): + """Create an image file""" + logger = params['logger'] + stat, ret = commands.getstatusoutput("dd if=/dev/zero of=%s bs=1 \ + count=1 seek=%s" % (img_name, img_size)) + if stat == 0: + logger.debug("create image result:\n%s" % ret) + return True + else: + return False + +def check_updated_device(params, guestname, domobj, srcfile): + """Check if the device is updated""" + logger = params['logger'] + xmlobj = domobj.get_xml_desc(guestname) + domxml = minidom.parseString(xmlobj) + + for diskTag in domxml.getElementsByTagName("source"): + if diskTag.parentNode.getAttribute("device") == 'cdrom': + upfile = diskTag.getAttribute("file") + elif diskTag.parentNode.getAttribute('device') == 'floppy': + upfile = diskTag.getAttribute("file") + + if upfile == srcfile: + return False, upfile + else: + return True, upfile + +def update_devflag(params): + """Update virtual device to a domain from xml""" + + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + logger = params['logger'] + guestname = params['guestname'] + devtype = params['devtype'] + if devtype == 'cdrom': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['guesttype'] = 'kvm' + xmlargs['hdmodel'] = 'ide' + xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom.img' + srcfile = xmlargs['bootcd'] + create_image(params, srcfile, '100M') + elif devtype == 'floppy': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['floppysource'] = '/var/lib/libvirt/boot/floppy.img' + srcfile = xmlargs['floppysource'] + create_image(params, srcfile, '2M') + else: + srcfile = None + logger.error("Wrong device type was specified.") + return 1 + + if not params.has_key('flag'): + flag = domainAPI.VIR_DOMAIN_AFFECT_CONFIG + + # Connect to local hypervisor connection URI + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + caps = conn.get_caps() + logger.debug(caps) + + # Generate device XML for updating + domobj = domainAPI.DomainAPI(virconn) + newxmlobj = xmlbuilder.XmlBuilder() + + if devtype == 'cdrom': + newdevxml = newxmlobj.build_cdrom(xmlargs) + elif devtype == 'floppy': + newdevxml = newxmlobj.build_floppy(xmlargs) + + logger.debug("block device xml desc:\n%s" %newdevxml) + + try: + try: + domobj.update_device_flag(guestname, newdevxml, flag) + res, upfile = check_updated_device(params, guestname, \ + domobj, srcfile) + if res: + logger.info("success to update '%s' device: %s\n" % \ + (devtype, upfile)) + else: + logger.error("fail to update '%s' device: %s\n" % \ + (devtype, upfile)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % + (e.response()['message'], e.response()['code'])) + conn.close() + logger.info("closed hypervisor connection") + return 1 + finally: + conn.close() + logger.info("closed hypervisor connection") + + return 0 + +def update_devflag_clean(params): + """Clean testing environment""" + logger = params['logger'] + + if params['devtype'] == 'cdrom': + os.system('rm -f /var/lib/libvirt/boot/cdrom.img') + elif params['devtype'] == 'floppy': + os.system('rm -f /var/lib/libvirt/boot/floppy.img') + else: + logger.debug("image file was not found.") -- 1.7.4.4

1 1

[libvirt] [PATCH] esx: Support folders in the path of vpx:// connection URIs
by Matthias Bolte 06 Sep '11

06 Sep '11

Allow the datacenter and compute resource parts of the path to be prefixed with folders. Therefore, the way the path is parsed has changed. Before, it was split in 2 or 3 items and the items' meanings were determined by their positions. Now the path can have 2 or more items and the the vCenter server is asked whether a folder, datacenter of compute resource with the specified name exists at the current hierarchy level. Before the datacenter and compute resource lookup automatically traversed folders during lookup. This is logic got removed and folders have to be specified explicitly. The proper datacenter path including folders is now used when accessing a datastore over HTTPS. This makes virsh dumpxml and define work for datacenters in folders. https://bugzilla.redhat.com/show_bug.cgi?id=732676 --- docs/drvesx.html.in | 10 ++- src/esx/esx_driver.c | 14 ++-- src/esx/esx_util.c | 19 +--- src/esx/esx_util.h | 1 + src/esx/esx_vi.c | 223 ++++++++++++++++++++++++++++++++++------ src/esx/esx_vi_generator.input | 4 + 6 files changed, 215 insertions(+), 56 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index da9d2a1..aa8ecd4 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -56,7 +56,7 @@ esx://example-esx.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the s URIs have this general form (<code>[...]</code> marks an optional part). </p> <pre> -type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters] +type://[username@]hostname[:port]/[[folder/...]datacenter/[folder/...][cluster/]server][?extraparameters] </pre> <p> The <code>type://</code> is either <code>esx://</code> or @@ -80,6 +80,14 @@ type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters <pre> vpx://example-vcenter.com/dc1/cluster1/example-esx.com </pre> + <p> + Datacenters and clusters can be organized in folders, those have to be + specified as well. The driver can handle folders + <span class="since">since 0.9.5</span>. + </p> +<pre> +vpx://example-vcenter.com/folder1/dc1/folder2/example-esx.com +</pre> <h4><a name="extraparams">Extra parameters</a></h4> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f1102ea..fd83a9c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -802,8 +802,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, char *url = NULL; if (hostSystemIpAddress == NULL && - (priv->parsedUri->path_datacenter == NULL || - priv->parsedUri->path_computeResource == NULL)) { + (priv->parsedUri->path == NULL || STREQ(priv->parsedUri->path, "/"))) { ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Path has to specify the datacenter and compute resource")); return -1; @@ -890,8 +889,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, /* - * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<path>][?<query parameter> ...] - * <path> = <datacenter>/<computeresource>[/<hostsystem>] + * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<path>][?<query parameter>...] + * <path> = [<folder>/...]<datacenter>/[<folder>/...]<computeresource>[/<hostsystem>] * * If no port is specified the default port is set dependent on the scheme and * transport parameter: @@ -905,7 +904,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, * For a vpx:// connection <path> references a host managed by the vCenter. * In case the host is part of a cluster then <computeresource> is the cluster * name. Otherwise <computeresource> and <hostsystem> are equal and the later - * can be omitted. + * can be omitted. As datacenters and computeresources can be organized in + * folders those have to be included in <path>. * * Optional query parameters: * - transport={http|https} @@ -2744,7 +2744,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) domain->conn->uri->server, domain->conn->uri->port); virBufferURIEncodeString(&buffer, directoryAndFileName); virBufferAddLit(&buffer, "?dcPath="); - virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); + virBufferURIEncodeString(&buffer, priv->parsedUri->path_datacenter); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); @@ -3212,7 +3212,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) virBufferURIEncodeString(&buffer, escapedName); virBufferAddLit(&buffer, ".vmx?dcPath="); - virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); + virBufferURIEncodeString(&buffer, priv->parsedUri->path_datacenter); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index c14179d..5243a0e 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -51,7 +51,6 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) int noVerify; int autoAnswer; char *tmp; - char *saveptr; if (parsedUri == NULL || *parsedUri != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -184,26 +183,13 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) } } - /* Expected format: [/]<datacenter>/<computeresource>[/<hostsystem>] */ if (uri->path != NULL) { - tmp = strdup(uri->path); + (*parsedUri)->path = strdup(uri->path); - if (tmp == NULL) { + if ((*parsedUri)->path == NULL) { virReportOOMError(); goto cleanup; } - - if (esxVI_String_DeepCopyValue(&(*parsedUri)->path_datacenter, - strtok_r(tmp, "/", &saveptr)) < 0 || - esxVI_String_DeepCopyValue(&(*parsedUri)->path_computeResource, - strtok_r(NULL, "/", &saveptr)) < 0 || - esxVI_String_DeepCopyValue(&(*parsedUri)->path_hostSystem, - strtok_r(NULL, "", &saveptr)) < 0) { - VIR_FREE(tmp); - goto cleanup; - } - - VIR_FREE(tmp); } if ((*parsedUri)->transport == NULL) { @@ -242,6 +228,7 @@ esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri) VIR_FREE((*parsedUri)->transport); VIR_FREE((*parsedUri)->vCenter); VIR_FREE((*parsedUri)->proxy_hostname); + VIR_FREE((*parsedUri)->path); VIR_FREE((*parsedUri)->path_datacenter); VIR_FREE((*parsedUri)->path_computeResource); VIR_FREE((*parsedUri)->path_hostSystem); diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 39fdb6d..4d7dccb 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -37,6 +37,7 @@ struct _esxUtil_ParsedUri { int proxy_type; char *proxy_hostname; int proxy_port; + char *path; char *path_datacenter; char *path_computeResource; char *path_hostSystem; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index f4033eb..6f4f9ee 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -770,55 +770,214 @@ int esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, esxUtil_ParsedUri *parsedUri) { - char *hostSystemName = NULL; + int result = -1; + char *path = NULL; + char *saveptr = NULL; + char *previousItem = NULL; + char *item = NULL; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + esxVI_ManagedObjectReference *root = NULL; + esxVI_Folder *folder = NULL; + + path = strdup(parsedUri->path); + + if (path == NULL) { + virReportOOMError(); + goto cleanup; + } + /* Lookup Datacenter */ - if (esxVI_LookupDatacenter(ctx, parsedUri->path_datacenter, - ctx->service->rootFolder, NULL, &ctx->datacenter, - esxVI_Occurrence_RequiredItem) < 0) { - return -1; + item = strtok_r(path, "/", &saveptr); + + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a datacenter"), + parsedUri->path); + goto cleanup; + } + + root = ctx->service->rootFolder; + + while (ctx->datacenter == NULL && item != NULL) { + esxVI_Folder_Free(&folder); + + /* Try to lookup item as a folder */ + if (esxVI_LookupFolder(ctx, item, root, NULL, &folder, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (folder != NULL) { + /* It's a folder, use it as new lookup root */ + if (root != ctx->service->rootFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = folder->_reference; + folder->_reference = NULL; + } else { + /* Try to lookup item as a datacenter */ + if (esxVI_LookupDatacenter(ctx, item, root, NULL, &ctx->datacenter, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } + + /* Build path_datacenter */ + if (virBufferUse(&buffer) > 0) { + virBufferAddChar(&buffer, '/'); + } + + virBufferAdd(&buffer, item, -1); + + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); + } + + if (ctx->datacenter == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datacenter specified in '%s'"), + parsedUri->path); + goto cleanup; } + if (virBufferError(&buffer)) { + virReportOOMError(); + goto cleanup; + } + + parsedUri->path_datacenter = virBufferContentAndReset(&buffer); + /* Lookup (Cluster)ComputeResource */ - if (esxVI_LookupComputeResource(ctx, parsedUri->path_computeResource, - ctx->datacenter->hostFolder, NULL, - &ctx->computeResource, - esxVI_Occurrence_RequiredItem) < 0) { - return -1; + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a compute resource"), + parsedUri->path); + goto cleanup; + } + + if (root != ctx->service->rootFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = ctx->datacenter->hostFolder; + + while (ctx->computeResource == NULL && item != NULL) { + esxVI_Folder_Free(&folder); + + /* Try to lookup item as a folder */ + if (esxVI_LookupFolder(ctx, item, root, NULL, &folder, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (folder != NULL) { + /* It's a folder, use it as new lookup root */ + if (root != ctx->datacenter->hostFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = folder->_reference; + folder->_reference = NULL; + } else { + /* Try to lookup item as a compute resource */ + if (esxVI_LookupComputeResource(ctx, item, root, NULL, + &ctx->computeResource, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } + + /* Build path_computeResource */ + if (virBufferUse(&buffer) > 0) { + virBufferAddChar(&buffer, '/'); + } + + virBufferAdd(&buffer, item, -1); + + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); + } + + if (ctx->computeResource == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find compute resource specified in '%s'"), + parsedUri->path); + goto cleanup; } if (ctx->computeResource->resourcePool == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve resource pool")); - return -1; + goto cleanup; + } + + if (virBufferError(&buffer)) { + virReportOOMError(); + goto cleanup; } + parsedUri->path_computeResource = virBufferContentAndReset(&buffer); + /* Lookup HostSystem */ - if (parsedUri->path_hostSystem == NULL && - STREQ(ctx->computeResource->_reference->type, + if (STREQ(ctx->computeResource->_reference->type, "ClusterComputeResource")) { - ESX_VI_ERROR(VIR_ERR_INVALID_ARG, "%s", - _("Path has to specify the host system")); - return -1; + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a host system"), + parsedUri->path); + goto cleanup; + } + + /* The path specified a cluster, it has to specify a host system too */ + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); } - if (parsedUri->path_hostSystem != NULL || - (parsedUri->path_computeResource != NULL && - parsedUri->path_hostSystem == NULL)) { - if (parsedUri->path_hostSystem != NULL) { - hostSystemName = parsedUri->path_hostSystem; - } else { - hostSystemName = parsedUri->path_computeResource; - } + if (item != NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' ends with an excess item"), + parsedUri->path); + goto cleanup; + } + + parsedUri->path_hostSystem = strdup(previousItem); + + if (parsedUri->path_hostSystem == NULL) { + virReportOOMError(); + goto cleanup; } - if (esxVI_LookupHostSystem(ctx, hostSystemName, + if (esxVI_LookupHostSystem(ctx, parsedUri->path_hostSystem, ctx->computeResource->_reference, NULL, &ctx->hostSystem, - esxVI_Occurrence_RequiredItem) < 0) { - return -1; + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; } - return 0; + if (ctx->hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find host system specified in '%s'"), + parsedUri->path); + goto cleanup; + } + + result = 0; + + cleanup: + if (result < 0) { + virBufferFreeAndReset(&buffer); + } + + if (root != ctx->service->rootFolder && + (ctx->datacenter == NULL || root != ctx->datacenter->hostFolder)) { + esxVI_ManagedObjectReference_Free(&root); + } + + VIR_FREE(path); + esxVI_Folder_Free(&folder); + + return result; } int @@ -1469,8 +1628,7 @@ esxVI_BuildSelectSetCollection(esxVI_Context *ctx) /* Folder -> childEntity (ManagedEntity) */ if (esxVI_BuildSelectSet(&ctx->selectSet_folderToChildEntity, "folderToChildEntity", - "Folder", "childEntity", - "folderToChildEntity\0") < 0) { + "Folder", "childEntity", NULL) < 0) { return -1; } @@ -1667,9 +1825,10 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->obj = root; objectSpec->skip = esxVI_Boolean_False; - if (STRNEQ(root->type, type)) { + if (STRNEQ(root->type, type) || STREQ(root->type, "Folder")) { if (STREQ(root->type, "Folder")) { - if (STREQ(type, "Datacenter") || STREQ(type, "ComputeResource") || + if (STREQ(type, "Folder") || STREQ(type, "Datacenter") || + STREQ(type, "ComputeResource") || STREQ(type, "ClusterComputeResource")) { objectSpec->selectSet = ctx->selectSet_folderToChildEntity; } else { diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 361a6e7..1a67a8c 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -755,6 +755,10 @@ managed object Datacenter extends ManagedEntity end +managed object Folder extends ManagedEntity +end + + managed object HostSystem extends ManagedEntity HostConfigManager configManager r end -- 1.7.4.1

1 0

[libvirt] [PATCH] mingw: Don't use interface as an identifier
by Matthias Bolte 06 Sep '11

06 Sep '11

Because it's a define use in MSCOM and its usage as identifier results in a compile error. --- tools/virsh.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 629233f..0f00463 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1256,9 +1256,8 @@ static const vshCmdOptDef opts_domif_setlink[] = { static bool cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; - const char *interface; + const char *iface; const char *state; const char *mac; const char *desc; @@ -1266,21 +1265,19 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) bool ret = false; unsigned int flags = 0; int i; - xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; xmlXPathObjectPtr obj = NULL; xmlNodePtr cur = NULL; xmlBufferPtr xml_buf = NULL; - if (!vshConnectionUsability(ctl, ctl->conn)) return false; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "interface", &interface) <= 0) + if (vshCommandOptString(cmd, "interface", &iface) <= 0) goto cleanup; if (vshCommandOptString(cmd, "state", &state) <= 0) @@ -1332,7 +1329,7 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) xmlStrEqual(cur->name, BAD_CAST "mac")) { mac = virXMLPropString(cur, "address"); - if (STRCASEEQ(mac, interface)) { + if (STRCASEEQ(mac, iface)) { VIR_FREE(mac); goto hit; } @@ -1342,7 +1339,7 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) } } - vshError(ctl, _("interface with address '%s' not found"), interface); + vshError(ctl, _("interface with address '%s' not found"), iface); goto cleanup; hit: @@ -1424,13 +1421,12 @@ static bool cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *interface = NULL; + const char *iface = NULL; int flags = 0; char *state = NULL; char *mac = NULL; bool ret = false; int i; - char *desc; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; @@ -1443,7 +1439,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain (ctl, cmd, NULL))) return false; - if (vshCommandOptString (cmd, "interface", &interface) <= 0) { + if (vshCommandOptString (cmd, "interface", &iface) <= 0) { virDomainFree(dom); return false; } @@ -1481,7 +1477,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) mac = virXMLPropString(cur, "address"); - if (STRCASEEQ(mac, interface)){ + if (STRCASEEQ(mac, iface)){ VIR_FREE(mac); goto hit; } @@ -1490,7 +1486,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) } } - vshError(ctl, _("Interface with address '%s' not found."), interface); + vshError(ctl, _("Interface with address '%s' not found."), iface); goto cleanup; hit: @@ -1500,7 +1496,7 @@ hit: xmlStrEqual(cur->name, BAD_CAST "link")) { state = virXMLPropString(cur, "state"); - vshPrint(ctl, "%s %s", interface, state); + vshPrint(ctl, "%s %s", iface, state); VIR_FREE(state); goto cleanup; @@ -1509,7 +1505,7 @@ hit: } /* attribute not found */ - vshPrint(ctl, "%s default", interface); + vshPrint(ctl, "%s default", iface); cleanup: xmlXPathFreeObject(obj); -- 1.7.4.1

2 2

[libvirt] [PATCH v2] virsh: Add more human-friendly output of domblkstat command
by Peter Krempa 06 Sep '11

06 Sep '11

Users of virsh complain that output of the domblkstat command is not intuitive enough. This patch adds explanation of fields returned by this command to the help section for domblkstat and the man page of virsh. Also a switch --human is added for domblkstat that prints the fields with more descriptive texts. https://bugzilla.redhat.com/show_bug.cgi?id=731656 Changes to v1: -Rebased to current head --- tools/virsh.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- tools/virsh.pod | 11 ++++++++++- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c7240e5..09337cb 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1054,13 +1054,21 @@ cleanup: */ static const vshCmdInfo info_domblkstat[] = { {"help", N_("get device block stats for a domain")}, - {"desc", N_("Get device block stats for a running domain.")}, + {"desc", N_("Get device block stats for a running domain.\n\n" + " Explanation of fields:\n" + " rd_req - count of read requests\n" + " rd_bytes - count of read bytes\n" + " wr_req - count of write requests\n" + " wr_bytes - count of written bytes\n" + " errs - error count")}, {NULL,NULL} }; static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, + {NULL, 0, 0, NULL} }; @@ -1070,6 +1078,7 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; + int humanReadable = vshCommandOptBool(cmd, "human"); if (!vshConnectionUsability (ctl, ctl->conn)) return false; @@ -1088,20 +1097,41 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) return false; } - if (stats.rd_req >= 0) - vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + if (humanReadable) { + /* human friendly output */ + vshPrint(ctl, N_("Device: %s\n"), device); + + if (stats.rd_req >= 0) + vshPrint (ctl, N_("read request count: %lld\n"), stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint (ctl, N_("number of read bytes: %lld\n"), stats.rd_bytes); + + if (stats.wr_req >= 0) + vshPrint (ctl, N_("write request count: %lld\n"), stats.wr_req); - if (stats.rd_bytes >= 0) - vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); + if (stats.wr_bytes >= 0) + vshPrint (ctl, N_("number of written bytes: %lld\n"), stats.wr_bytes); - if (stats.wr_req >= 0) - vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); + if (stats.errs >= 0) + vshPrint (ctl, N_("error count: %lld\n"), stats.errs); + } else { + /* script friendly output */ + if (stats.rd_req >= 0) + vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); - if (stats.wr_bytes >= 0) - vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + if (stats.wr_req >= 0) + vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); - if (stats.errs >= 0) - vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + if (stats.wr_bytes >= 0) + vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + + if (stats.errs >= 0) + vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + } virDomainFree(dom); return true; diff --git a/tools/virsh.pod b/tools/virsh.pod index 30c0721..c333b2a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -501,10 +501,19 @@ be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. -=item B<domblkstat> I<domain> I<block-device> +=item B<domblkstat> I<domain> I<block-device> [I<--human>] Get device block stats for a running domain. +Use I<--human> for a more human readable output. + +B<Explanation of fields:> + rd_req - count of read requests + rd_bytes - count of read bytes + wr_req - count of write requests + wr_bytes - count of written bytes + errs - error count + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.3.4

2 2

[libvirt] [PATCH RFC 0/2] XML: Improve XML parse error reporting
by Peter Krempa 06 Sep '11

06 Sep '11

First patch modifies the error reporting function on parse errors of XML files. A new, more informative message is presented to the user, containing filename of the offending file, error description and context of the error in libxml2 style. Second patch changes default filenames used while parsing XML strings in memory to NULL, so that the error reporting function does not print bougus filename. src/conf/domain_conf.c - change "domain.xml" to NULL src/security/virt-aa-helper.c - change "domain.xml" to NULL src/util/xml.c - modify error reporting function Peter Krempa (2): XML: Improve XML parsing error messages XML: Suppress printing "domain.xml" for parse errors on XML strings src/conf/domain_conf.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/util/xml.c | 88 +++++++++++++++++++++++++++++++++++------ 3 files changed, 78 insertions(+), 14 deletions(-) -- 1.7.3.4

3 9

[libvirt] [PATCH v3 0/5] Virtual interface link state modification
by Peter Krempa 06 Sep '11

06 Sep '11

This patchset adds the ability for libvirt users to control interface link state of the virtual network devices provided by hypervisors. Modification of the link state is accomplished by adding a new XML element <link state"up"> or "down" to the domain XML. The corresponding network interface is thereafter initialised with the desired state. Live modification of the link state is achieved by calling virDomainUpdateDeviceFlags containing a modified interface configuration. Yet, users may modify only link state of an interface. This feature allows propagation of network topology changes to guests, testing scenarios in complex virtual networks, etc ... Future upgrade: - add support for VirtualBox Modifications to v2: - Rebase to curent HEAD Modifications to v1: - use virUpdateDeviceFlags instead of dedicated API - incorporate helpful comments by Eric Blake https://bugzilla.redhat.com/show_bug.cgi?id=643373 Peter Krempa (5): link-state: util: Add equality comparision functions for structures link-state: conf: Add element to XML for controling link state link-state: qemu: Add monitor handling for link state modification link-state: qemu: Add net intf modification to virUpdateDeviceFlags link-state: virsh: Add wrapper commands for changing link state docs/formatdomain.html.in | 21 +++ docs/schemas/network.rng | 11 ++ src/conf/domain_conf.c | 24 ++++ src/conf/domain_conf.h | 11 ++ src/qemu/qemu_driver.c | 24 ++++ src/qemu/qemu_hotplug.c | 176 ++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 8 ++ src/qemu/qemu_monitor.c | 19 +++ src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 23 ++++ src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_monitor_text.c | 46 +++++++ src/qemu/qemu_monitor_text.h | 4 + src/qemu/qemu_process.c | 47 +++++++- src/util/network.c | 62 +++++++++ src/util/network.h | 5 + tools/virsh.c | 286 ++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 11 ++ 18 files changed, 785 insertions(+), 1 deletions(-) -- 1.7.3.4

2 10

[libvirt] [PATCH] redirdev: allows to specify device address
by Marc-André Lureau 06 Sep '11

06 Sep '11

It is important to be able to attach USB redirected devices to a particular controller (one that supports USB2 for instance). Without this patch, only the default bus was used. <redirdev bus='usb' type='spicevmc'> <address type='usb' bus='0' port='4'/> </redirdev> --- docs/formatdomain.html.in | 19 +++++++++++++------ docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 14 ++++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 1 + 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b960381..399388f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1417,14 +1417,21 @@ tunnel; <code>type='tcp'</code> or <code>type='spicevmc'</code> (which uses the usbredir channel of a <a href="#elementsGraphics">SPICE graphics - device</a>) are typical. Further sub-elements, such - as <code><source></code>, may be required according to - the given type, although a <code><target></code> - sub-element is not required (since the consumer of the - character device is the hypervisor itself, rather than a - device visible in the guest).</dd> + device</a>) are typical.</dd> </dl> + <p> + The redirdev element has an optional sub-element + <code><address></code> which can tie the device to a + particular controller. + </p> + <p> + Further sub-elements, such as <code><source></code>, may + be required according to the given type, although + a <code><target></code> sub-element is not required (since + the consumer of the character device is the hypervisor itself, + rather than a device visible in the guest). + </p> <h4><a name="elementsSmartcard">Smartcard devices</a></h4> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8e7fd63..02c3c7f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1986,6 +1986,9 @@ <ref name="qemucdevSrcTypeChoice"/> </attribute> <ref name="qemucdevSrcDef"/> + <optional> + <ref name="address"/> + </optional> </element> </define> <define name="hostdev"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cce9955..706f445 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5518,6 +5518,18 @@ virDomainRedirdevDefParseXML(const xmlNodePtr node, def->source.chr.data.spicevmc = VIR_DOMAIN_CHR_SPICEVMC_USBREDIR; } + if (virDomainDeviceInfoParseXML(node, &def->info, flags) < 0) + goto error; + + if (def->bus == VIR_DOMAIN_REDIRDEV_BUS_USB && + def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { + virDomainReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid address for a USB device")); + goto error; + } + + cleanup: VIR_FREE(bus); VIR_FREE(type); @@ -10274,6 +10286,8 @@ virDomainRedirdevDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <redirdev bus='%s'", bus); if (virDomainChrSourceDefFormat(buf, &def->source.chr, false, flags) < 0) return -1; + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; virBufferAddLit(buf, " </redirdev>\n"); return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args index 4d4f30a..f6270d5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args @@ -6,5 +6,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -chardev socket,id=charredir0,host=localhost,port=4000 \ -device usb-redir,chardev=charredir0,id=redir0 \ -chardev spicevmc,id=charredir1,name=usbredir \ --device usb-redir,chardev=charredir1,id=redir1 \ +-device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,multifunction=on,addr=0x3.0x0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml index c73e569..1dac3fb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml @@ -34,6 +34,7 @@ <protocol type='raw'/> </redirdev> <redirdev bus='usb' type='spicevmc'> + <address type='usb' bus='0' port='4'/> </redirdev> <memballoon model='virtio'/> </devices> -- 1.7.6

2 1

[libvirt] [PATCH 0/8 v2] Report disk latency info
by Osier Yang 06 Sep '11

06 Sep '11

This patch series introduces a new API to report the disk latency related information, which is supported by upstream QEMU just a few days ago (commit c488c7f649, Thu Aug 25). Per previous dicussion on the ABI compatiblity, and API design principle, the new API is defined with style: int virDomainBlockStatsFlags (virDomainPtr dom, const char *path, virTypeParamsPtr params, int *nparams, unsigned int flags) V1 - V2: * Use virTypedParameter instead of creating a new struct for the new API. * Update comments for the API, (Eric's suggestion). [PATCH 1/8] latency: Define new public API and structure [PATCH 2/8] latency: Define the internal driver callback [PATCH 3/8] latency: Implemente the public API [PATCH 4/8] latency: Wire up the remote protocol [PATCH 5/8] latency: Update monitor functions for new latency fields [PATCH 6/8] latency: Implemente internal API for qemu driver [PATCH 7/8] latency: Expose the new API for Python binding [PATCH 8/8] latency: Update cmdBlkStats to use new API Regards, Osier

2 17

[libvirt] [PATCH 1/2] make remote_exec_pexpect return the output of command
by Guannan Ren 06 Sep '11

06 Sep '11

*utils/Python/utils.py return 0,child.before intead *repos/remoteAccess/tcp_setup.py repos/remoteAccess/tls_setup.py switch over to use new remote_exec_pexpect() --- repos/remoteAccess/tcp_setup.py | 18 +++++++++--------- repos/remoteAccess/tls_setup.py | 20 ++++++++++---------- utils/Python/utils.py | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py index 8f88810..b3877f7 100644 --- a/repos/remoteAccess/tcp_setup.py +++ b/repos/remoteAccess/tcp_setup.py @@ -56,7 +56,7 @@ def sasl_user_add(target_machine, username, password, util, logger): """ execute saslpasswd2 to add sasl user """ logger.info("add sasl user on server side") saslpasswd2_add = "echo %s | %s -a libvirt %s" % (password, SASLPASSWD2, username) - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, saslpasswd2_add) if ret: logger.error("failed to add sasl user") @@ -70,7 +70,7 @@ def tcp_libvirtd_set(target_machine, username, password, logger.info("setting libvirtd.conf on libvirt server") # open libvirtd --listen option listen_open_cmd = "echo 'LIBVIRTD_ARGS=\"--listen\"' >> %s" % SYSCONFIG_LIBVIRTD - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, listen_open_cmd) if ret: logger.error("failed to uncomment --listen in %s" % SYSCONFIG_LIBVIRTD) @@ -79,7 +79,7 @@ def tcp_libvirtd_set(target_machine, username, password, # set listen_tls logger.info("set listen_tls to 0 in %s" % LIBVIRTD_CONF) listen_tls_disable = "echo \"listen_tls = 0\" >> %s" % LIBVIRTD_CONF - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, listen_tls_disable) if ret: logger.error("failed to set listen_tls to 0 in %s" % LIBVIRTD_CONF) @@ -89,7 +89,7 @@ def tcp_libvirtd_set(target_machine, username, password, if listen_tcp == 'enable': logger.info("enable listen_tcp = 1 in %s" % LIBVIRTD_CONF) listen_tcp_set = "echo 'listen_tcp = 1' >> %s" % LIBVIRTD_CONF - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, listen_tcp_set) if ret: logger.error("failed to set listen_tcp in %s" % LIBVIRTD_CONF) @@ -98,7 +98,7 @@ def tcp_libvirtd_set(target_machine, username, password, # set auth_tcp logger.info("set auth_tcp to \"%s\" in %s" % (auth_tcp, LIBVIRTD_CONF)) auth_tcp_set = "echo 'auth_tcp = \"%s\"' >> %s" % (auth_tcp, LIBVIRTD_CONF) - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, auth_tcp_set) if ret: logger.error("failed to set auth_tcp in %s" % LIBVIRTD_CONF) @@ -107,7 +107,7 @@ def tcp_libvirtd_set(target_machine, username, password, # restart remote libvirtd service libvirtd_restart_cmd = "service libvirtd restart" logger.info("libvirtd restart") - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, libvirtd_restart_cmd) if ret: logger.error("failed to restart libvirtd service") @@ -225,18 +225,18 @@ def tcp_setup_clean(params): if auth_tcp == 'sasl': saslpasswd2_delete = "%s -a libvirt -d %s" % (SASLPASSWD2, username) - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, saslpasswd2_delete) if ret: logger.error("failed to delete sasl user") libvirtd_conf_retore = "sed -i -n '/^[ #]/p' %s" % LIBVIRTD_CONF - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, libvirtd_conf_retore) if ret: logger.error("failed to restore %s" % LIBVIRTD_CONF) sysconfig_libvirtd_restore = "sed -i -n '/^[ #]/p' %s" % SYSCONFIG_LIBVIRTD - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, sysconfig_libvirtd_restore) if ret: logger.error("failed to restore %s" % SYSCONFIG_LIBVIRTD) diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py index 4e7f24e..27bb8a7 100644 --- a/repos/remoteAccess/tls_setup.py +++ b/repos/remoteAccess/tls_setup.py @@ -213,7 +213,7 @@ def deliver_cert(target_machine, username, password, pkipath, util, logger): # mkdir /etc/pki/libvirt/private on remote host libvirt_priv_cmd = "mkdir -p %s" % PRIVATE_KEY_FOLDER - ret = util.remote_exec_pexpect(target_machine, username, password, libvirt_priv_cmd) + ret, output = util.remote_exec_pexpect(target_machine, username, password, libvirt_priv_cmd) if ret: logger.error("failed to make /etc/pki/libvirt/private on %s" % target_machine) return 1 @@ -257,7 +257,7 @@ def sasl_user_add(target_machine, username, password, util, logger): """ execute saslpasswd2 to add sasl user """ logger.info("add sasl user on server side") saslpasswd2_add = "echo %s | %s -a libvirt %s" % (password, SASLPASSWD2, username) - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, saslpasswd2_add) if ret: logger.error("failed to add sasl user") @@ -271,7 +271,7 @@ def tls_libvirtd_set(target_machine, username, password, logger.info("setting libvirtd.conf on tls server") # open libvirtd --listen option listen_open_cmd = "echo 'LIBVIRTD_ARGS=\"--listen\"' >> /etc/sysconfig/libvirtd" - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, listen_open_cmd) if ret: logger.error("failed to uncomment --listen in /etc/sysconfig/libvirtd") @@ -280,7 +280,7 @@ def tls_libvirtd_set(target_machine, username, password, if listen_tls == 'disable': logger.info("set listen_tls to 0 in %s" % LIBVIRTD_CONF) listen_tls_disable = "echo \"listen_tls = 0\" >> %s" % LIBVIRTD_CONF - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, listen_tls_disable) if ret: logger.error("failed to set listen_tls to 0 in %s" % LIBVIRTD_CONF) @@ -289,7 +289,7 @@ def tls_libvirtd_set(target_machine, username, password, if auth_tls == 'sasl': logger.info("enable auth_tls = sasl in %s" % LIBVIRTD_CONF) auth_tls_set = "echo 'auth_tls = \"sasl\"' >> %s" % LIBVIRTD_CONF - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, auth_tls_set) if ret: logger.error("failed to set auth_tls to sasl in %s" % LIBVIRTD_CONF) @@ -298,7 +298,7 @@ def tls_libvirtd_set(target_machine, username, password, # restart remote libvirtd service libvirtd_restart_cmd = "service libvirtd restart" logger.info("libvirtd restart") - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, libvirtd_restart_cmd) if ret: logger.error("failed to restart libvirtd service") @@ -311,7 +311,7 @@ def iptables_stop(target_machine, username, password, util, logger): """ This is a temprory method in favor of migration """ logger.info("stop local and remote iptables temprorily") iptables_stop_cmd = "service iptables stop" - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, iptables_stop_cmd) if ret: logger.error("failed to stop remote iptables service") @@ -466,13 +466,13 @@ def tls_setup_clean(params): util = utils.Utils() cacert_rm = "rm -f %s/cacert.pem" % CA_FOLDER - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, cacert_rm) if ret: logger.error("failed to remove cacert.pem on remote machine") ca_libvirt_rm = "rm -rf %s" % CERTIFICATE_FOLDER - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, ca_libvirt_rm) if ret: logger.error("failed to remove libvirt folder") @@ -482,7 +482,7 @@ def tls_setup_clean(params): if auth_tls == 'sasl': saslpasswd2_delete = "%s -a libvirt -d %s" % (SASLPASSWD2, username) - ret = util.remote_exec_pexpect(target_machine, username, + ret, output = util.remote_exec_pexpect(target_machine, username, password, saslpasswd2_delete) if ret: logger.error("failed to delete sasl user") diff --git a/utils/Python/utils.py b/utils/Python/utils.py index 6787e87..d521254 100644 --- a/utils/Python/utils.py +++ b/utils/Python/utils.py @@ -406,10 +406,10 @@ class Utils(object): child.sendline(password) elif index == 2: child.close() - return 0 + return 0, child.before elif index == 3: child.close() - return 1 + return 1, "" return 0 -- 1.7.1

2 4

[libvirt] [test-API][PATCH 1/2] Remove cases/migrate.conf testcases and create a set of migration testcases
by Guannan Ren 06 Sep '11

06 Sep '11

*cases/migrate.conf remove it. *cases/migration/* create a new set of migraion testcases with tcp, tls and sasl combination It's huge, so I send the header of commit here. --- cases/migrate.conf | 97 ---- cases/migration/ssh_persistent_paused_no_dst.conf | 459 +++++++++++++++++++ .../migration/ssh_persistent_paused_with_dst.conf | 459 +++++++++++++++++++ cases/migration/ssh_persistent_running_no_dst.conf | 435 ++++++++++++++++++ .../migration/ssh_persistent_running_with_dst.conf | 435 ++++++++++++++++++ cases/migration/ssh_transient_paused_no_dst.conf | 403 +++++++++++++++++ cases/migration/ssh_transient_paused_with_dst.conf | 403 +++++++++++++++++ cases/migration/ssh_transient_running_no_dst.conf | 388 ++++++++++++++++ .../migration/ssh_transient_running_with_dst.conf | 382 ++++++++++++++++ cases/migration/tcp_persistent_paused_no_dst.conf | 471 ++++++++++++++++++++ .../migration/tcp_persistent_paused_with_dst.conf | 471 ++++++++++++++++++++ cases/migration/tcp_persistent_running_no_dst.conf | 447 +++++++++++++++++++ .../migration/tcp_persistent_running_with_dst.conf | 447 +++++++++++++++++++ .../tcp_sasl_persistent_paused_no_dst.conf | 167 +++++++ .../tcp_sasl_persistent_paused_with_dst.conf | 168 +++++++ .../tcp_sasl_persistent_running_no_dst.conf | 159 +++++++ .../tcp_sasl_persistent_running_with_dst.conf | 159 +++++++ .../tcp_sasl_transient_paused_no_dst.conf | 151 +++++++ .../tcp_sasl_transient_paused_with_dst.conf | 151 +++++++ .../tcp_sasl_transient_running_no_dst.conf | 143 ++++++ .../tcp_sasl_transient_running_with_dst.conf | 143 ++++++ cases/migration/tcp_transient_paused_no_dst.conf | 415 +++++++++++++++++ cases/migration/tcp_transient_paused_with_dst.conf | 415 +++++++++++++++++ cases/migration/tcp_transient_running_no_dst.conf | 400 +++++++++++++++++ .../migration/tcp_transient_running_with_dst.conf | 394 ++++++++++++++++ cases/migration/tls_persistent_paused_no_dst.conf | 471 ++++++++++++++++++++ .../migration/tls_persistent_paused_with_dst.conf | 471 ++++++++++++++++++++ cases/migration/tls_persistent_running_no_dst.conf | 447 +++++++++++++++++++ .../migration/tls_persistent_running_with_dst.conf | 447 +++++++++++++++++++ .../tls_sasl_persistent_paused_no_dst.conf | 167 +++++++ .../tls_sasl_persistent_paused_with_dst.conf | 167 +++++++ .../tls_sasl_persistent_running_no_dst.conf | 159 +++++++ .../tls_sasl_persistent_running_with_dst.conf | 159 +++++++ .../tls_sasl_transient_paused_no_dst.conf | 151 +++++++ .../tls_sasl_transient_paused_with_dst.conf | 151 +++++++ .../tls_sasl_transient_running_no_dst.conf | 143 ++++++ .../tls_sasl_transient_running_with_dst.conf | 143 ++++++ cases/migration/tls_transient_paused_no_dst.conf | 415 +++++++++++++++++ cases/migration/tls_transient_paused_with_dst.conf | 415 +++++++++++++++++ cases/migration/tls_transient_running_no_dst.conf | 400 +++++++++++++++++ .../migration/tls_transient_running_with_dst.conf | 394 ++++++++++++++++ 41 files changed, 12765 insertions(+), 97 deletions(-) delete mode 100644 cases/migrate.conf create mode 100644 cases/migration/ssh_persistent_paused_no_dst.conf create mode 100644 cases/migration/ssh_persistent_paused_with_dst.conf create mode 100644 cases/migration/ssh_persistent_running_no_dst.conf create mode 100644 cases/migration/ssh_persistent_running_with_dst.conf create mode 100644 cases/migration/ssh_transient_paused_no_dst.conf create mode 100644 cases/migration/ssh_transient_paused_with_dst.conf create mode 100644 cases/migration/ssh_transient_running_no_dst.conf create mode 100644 cases/migration/ssh_transient_running_with_dst.conf create mode 100644 cases/migration/tcp_persistent_paused_no_dst.conf create mode 100644 cases/migration/tcp_persistent_paused_with_dst.conf create mode 100644 cases/migration/tcp_persistent_running_no_dst.conf create mode 100644 cases/migration/tcp_persistent_running_with_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_paused_no_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_paused_with_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_running_no_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_running_with_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_paused_no_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_paused_with_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_running_no_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_running_with_dst.conf create mode 100644 cases/migration/tcp_transient_paused_no_dst.conf create mode 100644 cases/migration/tcp_transient_paused_with_dst.conf create mode 100644 cases/migration/tcp_transient_running_no_dst.conf create mode 100644 cases/migration/tcp_transient_running_with_dst.conf create mode 100644 cases/migration/tls_persistent_paused_no_dst.conf create mode 100644 cases/migration/tls_persistent_paused_with_dst.conf create mode 100644 cases/migration/tls_persistent_running_no_dst.conf create mode 100644 cases/migration/tls_persistent_running_with_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_paused_no_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_paused_with_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_running_no_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_running_with_dst.conf create mode 100644 cases/migration/tls_sasl_transient_paused_no_dst.conf create mode 100644 cases/migration/tls_sasl_transient_paused_with_dst.conf create mode 100644 cases/migration/tls_sasl_transient_running_no_dst.conf create mode 100644 cases/migration/tls_sasl_transient_running_with_dst.conf create mode 100644 cases/migration/tls_transient_paused_no_dst.conf create mode 100644 cases/migration/tls_transient_paused_with_dst.conf create mode 100644 cases/migration/tls_transient_running_no_dst.conf create mode 100644 cases/migration/tls_transient_running_with_dst.conf

2 3

[libvirt] [PATCH 0/3] Libvirt RPC dispatching and unresponsive QEMU
by Michal Privoznik 05 Sep '11

05 Sep '11

If there is an unresponsive qemu process and libvirt access it's monitor, it will not get any response and this thread will block indefinitely, until the qemu process resumes or it's destroyed. If users continues executing APIs against that domain, libvirt will run out of worker threads and hangs (if those APIs will access monitor as well). Although, they will timeout in approx 30 seconds, which will free some workers, during that time is libvirt unable to process any request. Even worse - if the number of unresponsive qemu exceeds the size of worker thread pool, libvirt will hangs forever, and even restarting the daemon will not make it any better. This patch set heals the daemon on several levels, so nothing from written above will cause it to hangs: 1. RPC dispatching - all APIs are now annotated as 'high' or 'low' priority. Then a special thread pool is created. Low priority APIs will be still placed into usual pool, but high priority can be placed into this new pool if the former has no free worker. Which APIs should be marked high and which low? The splitting presented here is my guessing. It is not something written in stone, but from the logic of things it is not safe to annotate any API which is NOT guaranteed to end in reasonable small time as high priority call. 2. Job queue size limit - this sets bound on the number of threads blocked by a stuck qemu. Okay, there exists timeout on this, but if user application continue dispatching low priority calls it can still consume all (low priority) worker threads and therefore affect other users/VMs. Even if they timeout in approx 30 secs. 3. Run monitor re-connect in a separate thread per VM. If libvirtd is restarted, it tries to reconnect to all running qemu processes. This is potentially risky - one stuck qemu block daemon startup. However, putting the monitor startup code into one thread per VM allows libvirtd to startup, accept client connections and work with all VMs which monitor was successfully re-opened. Unresponsive qemu will hold job until we open the monitor. So clever user application can destroy such domain. All APIs requiring job will just fail in acquiring lock. Michal Privoznik (3): daemon: Create priority workers pool qemu: Introduce job queue size limit qemu: Deal with stucked qemu on daemon startup daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 10 +- daemon/libvirtd.conf | 6 + daemon/remote.c | 26 ++ daemon/remote.h | 2 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 7 + src/qemu/qemu_conf.c | 4 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 17 ++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 23 +-- src/qemu/qemu_process.c | 89 ++++++- src/remote/qemu_protocol.x | 13 +- src/remote/remote_protocol.x | 544 +++++++++++++++++++++--------------------- src/rpc/gendispatch.pl | 48 ++++- src/rpc/virnetserver.c | 32 +++- src/rpc/virnetserver.h | 6 +- src/util/threadpool.c | 38 ++- src/util/threadpool.h | 1 + 20 files changed, 554 insertions(+), 318 deletions(-) -- 1.7.3.4

5 22

[libvirt] [PATCH v2] Source control for storage pool
by Lei Li 05 Sep '11

05 Sep '11

Fix bug #611823 storage driver should prohibit pools with duplicate underlying storage. Add API virStoragePoolSourceFindDuplicate() to do uniqueness check based on source location infomation for pool type. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- src/conf/storage_conf.c | 80 ++++++++++++++++++++++++++++++++++++++++++ src/conf/storage_conf.h | 5 +++ src/libvirt_private.syms | 2 + src/storage/storage_driver.c | 6 +++ 4 files changed, 93 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 8d14e87..1e7da69 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1311,6 +1311,21 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, return NULL; } +virStoragePoolObjPtr +virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, + virStoragePoolDefPtr def) { + unsigned int i, j; + + for (i = 0; i < pool->def->source.ndevice; i++) { + for (j = 0; j < def->source.ndevice; j++) { + if (STREQ(pool->def->source.devices[i].path, def->source.devices[j].path)) + return pool; + } + } + + return NULL; +} + void virStoragePoolObjClearVols(virStoragePoolObjPtr pool) { @@ -1701,6 +1716,71 @@ cleanup: return ret; } +int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def) +{ + int i; + int ret = 1; + virStoragePoolObjPtr pool = NULL; + virStoragePoolObjPtr matchpool = NULL; + + /* Check the pool list for duplicate underlying storage */ + for (i = 0; i < pools->count; i++) { + pool = pools->objs[i]; + if (def->type != pool->def->type) + continue; + + virStoragePoolObjLock(pool); + + switch (pool->def->type) { + case VIR_STORAGE_POOL_DIR: + if (STREQ(pool->def->target.path, def->target.path)) + matchpool = pool; + break; + case VIR_STORAGE_POOL_NETFS: + if ((STREQ(pool->def->source.dir, def->source.dir)) \ + && (STREQ(pool->def->source.host.name, def->source.host.name))) + matchpool = pool; + break; + case VIR_STORAGE_POOL_SCSI: + if (STREQ(pool->def->source.adapter, def->source.adapter)) + matchpool = pool; + break; + case VIR_STORAGE_POOL_ISCSI: + { + matchpool = virStoragePoolSourceFindDuplicateDevices(pool, def); + if (matchpool) { + if (STREQ(matchpool->def->source.host.name, def->source.host.name)) { + if ((matchpool->def->source.initiator.iqn) && (def->source.initiator.iqn)) { + if (STREQ(matchpool->def->source.initiator.iqn, def->source.initiator.iqn)) + break; + matchpool = NULL; + } + break; + } + matchpool = NULL; + } + break; + } + case VIR_STORAGE_POOL_FS: + case VIR_STORAGE_POOL_LOGICAL: + case VIR_STORAGE_POOL_DISK: + matchpool = virStoragePoolSourceFindDuplicateDevices(pool, def); + break; + default: + break; + } + virStoragePoolObjUnlock(pool); + } + + if (matchpool) { + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("Storage source conflict with pool: '%s'"), + matchpool->def->name); + ret = -1; + } + return ret; +} void virStoragePoolObjLock(virStoragePoolObjPtr obj) { diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 271441a..d115a15 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -335,6 +335,8 @@ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid); virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name); +virStoragePoolObjPtr virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, + virStoragePoolDefPtr def); virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key); @@ -388,6 +390,9 @@ int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def, unsigned int check_active); +int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def); + void virStoragePoolObjLock(virStoragePoolObjPtr obj); void virStoragePoolObjUnlock(virStoragePoolObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9f03e30..316eb7e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -947,7 +947,9 @@ virStoragePoolObjClearVols; virStoragePoolObjDeleteDef; virStoragePoolObjFindByName; virStoragePoolObjFindByUUID; +virStoragePoolSourceFindDuplicateDevices; virStoragePoolObjIsDuplicate; +virStoragePoolSourceFindDuplicate; virStoragePoolObjListFree; virStoragePoolObjLock; virStoragePoolObjRemove; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 68cac1f..c05b74e 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -536,6 +536,9 @@ storagePoolCreate(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 1) < 0) goto cleanup; + if (virStoragePoolSourceFindDuplicate(&driver->pools, def) < 0) + goto cleanup; + if ((backend = virStorageBackendForType(def->type)) == NULL) goto cleanup; @@ -589,6 +592,9 @@ storagePoolDefine(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 0) < 0) goto cleanup; + if (virStoragePoolSourceFindDuplicate(&driver->pools, def) < 0) + goto cleanup; + if (virStorageBackendForType(def->type) == NULL) goto cleanup; -- 1.7.1

2 1

[libvirt] [PATCH 1/3] PIIX3 USB controller is on function 2
by Marc-André Lureau 05 Sep '11

05 Sep '11

Current code reserves slot 1 function 2 even if there is a user defined PIIX3 USB controller there. --- src/qemu/qemu_command.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6ff1b2c..e4bdb57 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1181,7 +1181,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) * hardcoded slot=1, multifunction device */ for (function = 0; function < QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) { - if (function == 1 && (reservedIDE || reservedUSB)) + if ((function == 1 && reservedIDE) || + (function == 2 && reservedUSB)) /* we have reserved this pci address */ continue; -- 1.7.6

2 4

Re: [libvirt] migration of vnlink VMs
by Oved Ourfalli 05 Sep '11

05 Sep '11

----- Original Message ----- > From: "Laine Stump" <lstump(a)redhat.com> > To: "Oved Ourfalli" <ovedo(a)redhat.com> > Cc: "Ayal Baron" <abaron(a)redhat.com>, "Barak Azulay" <bazulay(a)redhat.com>, "Shahar Havivi" <shaharh(a)redhat.com>, > "Itamar Heim" <iheim(a)redhat.com>, "Dan Kenigsberg" <danken(a)redhat.com> > Sent: Thursday, April 28, 2011 10:20:35 AM > Subject: Re: migration of vnlink VMs > Oved, > > Would it be okay to repost this message to the thread on libvir-list > so > that other parties can add their thoughts? > Of course. I'm sending my answer to the libvirt list. > On 04/27/2011 09:58 AM, Oved Ourfalli wrote: > > Laine, hello. > > > > We read your proposal for abstraction of guest<--> host network > > connection in libvirt. > > > > You has an open issue there regarding the vepa/vnlink attributes: > > "3) What about the parameters in the<virtualport> element that are > > currently used by vepa/vnlink. Do those belong with the host, or > > with the guest?" > > > > The parameters for the virtualport element should be on the guest, > > and not the host, because a specific interface can run multiple > > profiles, > > Are you talking about host interface or guest interface? If you mean > that multiple different profiles can be used when connecting to a > particular switch - as long as there are only a few different > profiles, > rather than each guest having its own unique profile, then it still > seems better to have the port profile live with the network definition > (and just define multiple networks, one for each port profile). > The profile names can be changed regularly, so it looks like it will be better to put them in the guest level, so that the network host file won't have to be changed on all hosts once something has changed in the profiles. Also, you will have a duplication of data, writing all the profile name on all the hosts that are connected to the vn-link/vepa switch. > > > so it will be a mistake to define a profile to be interface > > specific on the host. Moreover, putting it in the guest level will > > enable us in the future (if supported by libvirt/qemu) to migrate > > a vm from a host with vepa/vnlink interfaces, to another host with > > a bridge, for example. > > It seems to me like doing exactly the opposite would make it easier to > migrate to a host that used a different kind of switching (from vepa > to > vnlink, or from a bridged interface to vepa, etc), since the port > profile required for a particular host's network would be at the host > waiting to be used. You are right, but we would want to have the option to prevent that from happening in case we wouldn't want to allow it. We can make the ability to migrate between different network types configurable, and we would like an easy way to tell libvirt - "please allow/don't allow it". > > > So, in the networks at the host level you will have: > > <network type='direct'> > > <name>red-network</name> > > <source mode='vepa'> > > <pool> > > <interface> > > <name>eth0</name> > > ..... > > </interface> > > <interface> > > <name>eth4</name> > > ..... > > </interface> > > <interface> > > <name>eth18</name> > > ..... > > </interface> > > </pool> > > </source> > > </network> > > > > And in the guest you will have (for vepa): > > <interface type='network'> > > <source network='red-network'/> > > <virtualport type="802.1Qbg"> > > <parameters managerid="11" typeid="1193047" typeidversion="2" > > instanceid="09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f"/> > > </virtualport> > > </interface> > > > > Or (for vnlink): > > <interface type='network'> > > <source network='red-network'/> > > <virtualport type="802.1Qbh"> > > <parameters profile_name="profile1"/> > > </virtualport> > > </interface> > > This illustrates the problem I was wondering about - in your example > it > would not be possible for the guest to migrate from the host using a > vepa switch to the host using a vnlink switch (and it would be > possible You are right. When trying to migrate between vepa and vnlink there will be missing attributes in each in case we leave it on the host. > to migrate to a host using a standard bridge only if the virtualport > element was ignored). If the virtualport element lived with the > network > definition of red-network on each host, it could be migrated without > problem. > > The only problematic thing would be if any of the attributes within > <parameters> was unique for each guest (I don't know anything about > the > individual attributes, but "instanceid" sounds like it might be > different for each guest). > > > Then, when migrating from a vepa/vnlink host to another vepa/vnlink > > host containing red-network, the profile attributes will be > > available at the guest domain xml. > > In case the target host has a red-network, which isn't vepa/vnlink, > > we want to be able to choose whether to make the use of the profile > > attributes optional (i.e., libvirt won't fail in case of migrating > > to a network of another type), or mandatory (i.e., libvirt will fail > > in case of migration to a non-vepa/vnlink network). > > > > We have something similar in CPU flags: > > <cpu match="exact"> > > <model>qemu64</model> > > <topology sockets="S" cores="C" threads="T"/> > > <feature policy="require/optional/disable......" > > name="sse2"/> > > </cpu> > > In this analogy, does "CPU flags" == "mode (vepa/vnlink/bridge)" or > does > "CPU flags" == "virtualport parameters" ? It seems like what you're > wanting can be satisfied by simply not defining "red-network" on the > hosts that don't have the proper networking setup available (maybe > what > you *really* want to call it is "red-vnlink-network"). What I meant to say in that is that we would like to have the ability to say if an attribute must me used, or not. The issues you mention are indeed interesting. I'm cc-ing libvirt-list to see what other people think. Putting it on the guest will indeed make it problematic to migrate between networks that need different parameters (vnlink/vepa for example). Oved

7 11

[libvirt] [BUG] Xen->libvirt: localtime reported as UTC
by Philipp Hahn 05 Sep '11

05 Sep '11

Hello, just a report, no fix for that bug yet. If I create a domain and set <clock offset='localtime'/>, that information is correctly translated to Xends sxpr data, but on reading it back I get it reported as 'utc': # virsh dumpxml 85664d3f-68dd-a4c2-4d2f-be7f276b95f0 | grep clock <clock offset='utc'/> # gfind localtime ./85664d3f-68dd-a4c2-4d2f-be7f276b95f0/config.sxp: (platform ((device_model /usr/lib64/xen/bin/qemu-dm) (localtime 1))) ./85664d3f-68dd-a4c2-4d2f-be7f276b95f0/config.sxp: (localtime 1) BYtE Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

3 6

[libvirt] [PATCH] Add directsync cache mode support for disk driver
by Osier Yang 05 Sep '11

05 Sep '11

Newer QEMU introduced cache=directsync for -drive, this patchset is to expose it in libvirt layer. * Introduced a new QEMU capability flag ($prefix_CACHE_DIRECTSYNC), As even $prefix_CACHE_V2 is set, we can't known if directsync is supported. --- docs/formatdomain.html.in | 2 +- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 6 +++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 29 ++++++++++++++++++++++------- tests/qemuargv2xmltest.c | 1 + tests/qemuxml2argvtest.c | 3 +++ tools/virsh.pod | 3 ++- 10 files changed, 39 insertions(+), 11 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f46771d..6cb36d3 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -976,7 +976,7 @@ <li> The optional <code>cache</code> attribute controls the cache mechanism, possible values are "default", "none", - "writethrough" and "writeback". + "writethrough", "writeback", and "directsync". <span class="since">Since 0.6.0</span> </li> <li> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index dd8c41a..e43b17d 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -829,6 +829,7 @@ <value>none</value> <value>writeback</value> <value>writethrough</value> + <value>directsync</value> </choice> </attribute> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 00212db..a2de8df 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -160,7 +160,8 @@ VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, "default", "none", "writethrough", - "writeback") + "writeback", + "directsync") VIR_ENUM_IMPL(virDomainDiskErrorPolicy, VIR_DOMAIN_DISK_ERROR_POLICY_LAST, "default", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8382d28..0abb75e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -165,6 +165,7 @@ enum virDomainDiskCache { VIR_DOMAIN_DISK_CACHE_DISABLE, VIR_DOMAIN_DISK_CACHE_WRITETHRU, VIR_DOMAIN_DISK_CACHE_WRITEBACK, + VIR_DOMAIN_DISK_CACHE_DIRECTSYNC, VIR_DOMAIN_DISK_CACHE_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f665de4..631d683 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -125,6 +125,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "sga", "virtio-blk-pci.event_idx", "virtio-net-pci.event_idx", + "cache-directsync", ); struct qemu_feature_flags { @@ -902,8 +903,11 @@ qemuCapsComputeCmdFlags(const char *help, if (strstr(help, "-drive")) { qemuCapsSet(flags, QEMU_CAPS_DRIVE); if (strstr(help, "cache=") && - !strstr(help, "cache=on|off")) + !strstr(help, "cache=on|off")) { qemuCapsSet(flags, QEMU_CAPS_DRIVE_CACHE_V2); + if (strstr(help, "directsync")) + qemuCapsSet(flags, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC); + } if (strstr(help, "format=")) qemuCapsSet(flags, QEMU_CAPS_DRIVE_FORMAT); if (strstr(help, "readonly=")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 13af0b9..c01d438 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -100,6 +100,7 @@ enum qemuCapsFlags { QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */ QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */ + QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 44a553b..fa52dc0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -64,14 +64,16 @@ VIR_ENUM_DECL(qemuDiskCacheV2) VIR_ENUM_IMPL(qemuDiskCacheV1, VIR_DOMAIN_DISK_CACHE_LAST, "default", "off", - "off", /* writethrough not supported, so for safety, disable */ - "on"); /* Old 'on' was equivalent to 'writeback' */ + "off", /* writethrough not supported, so for safety, disable */ + "on", /* Old 'on' was equivalent to 'writeback' */ + "off"); /* directsync not supported, for safety, disable */ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST, "default", "none", "writethrough", - "writeback"); + "writeback", + "directsync"); VIR_ENUM_DECL(qemuVideo) @@ -1516,10 +1518,21 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, } if (disk->cachemode) { - const char *mode = - qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_V2) ? - qemuDiskCacheV2TypeToString(disk->cachemode) : - qemuDiskCacheV1TypeToString(disk->cachemode); + const char *mode = NULL; + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_V2)) { + mode = qemuDiskCacheV2TypeToString(disk->cachemode); + + if (disk->cachemode == VIR_DOMAIN_DISK_CACHE_DIRECTSYNC && + !qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk cache mode 'directsync' is not " + "supported by this QEMU")); + goto error; + } + } else { + mode = qemuDiskCacheV1TypeToString(disk->cachemode); + } virBufferAsprintf(&opt, ",cache=%s", mode); } else if (disk->shared && !disk->readonly) { @@ -5211,6 +5224,8 @@ qemuParseCommandLineDisk(virCapsPtr caps, def->cachemode = VIR_DOMAIN_DISK_CACHE_WRITEBACK; else if (STREQ(values[i], "writethrough")) def->cachemode = VIR_DOMAIN_DISK_CACHE_WRITETHRU; + else if (STREQ(values[i], "directsync")) + def->cachemode = VIR_DOMAIN_DISK_CACHE_DIRECTSYNC; } else if (STREQ(keywords[i], "werror") || STREQ(keywords[i], "rerror")) { if (STREQ(values[i], "stop")) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index c2b6cf2..91f15af 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -168,6 +168,7 @@ mymain(void) DO_TEST("disk-drive-cache-v2-wt"); DO_TEST("disk-drive-cache-v2-wb"); DO_TEST("disk-drive-cache-v2-none"); + DO_TEST("disk-drive-cache-directsync"); DO_TEST("disk-drive-network-nbd"); DO_TEST("disk-drive-network-rbd"); DO_TEST("disk-drive-network-sheepdog"); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6e8da5e..b009bf3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -338,6 +338,9 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-cache-v2-none", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); + DO_TEST("disk-drive-cache-directsync", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, + QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-network-nbd", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-network-rbd", false, diff --git a/tools/virsh.pod b/tools/virsh.pod index b90c26e..5ac2c5c 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1099,7 +1099,8 @@ floppy device; consider using B<update-device> for this usage instead. I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<persistent> indicates the changes will affect the next boot of the domain. I<sourcetype> can indicate the type of source (block|file) -I<cache> can be one of "default", "none", "writethrough" or "writeback". +I<cache> can be one of "default", "none", "writethrough", "writeback", or +"directsync". I<serial> is the serial of disk device. I<shareable> indicates the disk device is shareable between domains. I<address> is the address of disk device in the form of pci:domain.bus.slot.function, -- 1.7.6

3 6

Re: [libvirt] [RFC] block I/O throttling: how to enable in libvirt
by Zhi Yong Wu 05 Sep '11

05 Sep '11

On Fri, Sep 02, 2011 at 08:34:19AM -0500, Adam Litke wrote: >From: Adam Litke <agl(a)us.ibm.com> >To: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> >Cc: libvir-list(a)redhat.com >Subject: Re: [libvirt] [RFC] block I/O throttling: how to enable in libvirt >Message-ID: <20110902133419.GW15683(a)aglitke.rchland.ibm.com> >References: <20110901050531.GB17963(a)f15.cn.ibm.com> > <20110902021447.GD19143(a)f15.cn.ibm.com> >MIME-Version: 1.0 >Content-Type: text/plain; charset=us-ascii >Content-Disposition: inline >In-Reply-To: <20110902021447.GD19143(a)f15.cn.ibm.com> >User-Agent: Mutt/1.5.21 (2010-09-15) >X-Brightmail-Tracker: AAAAAA== >X-Xagent-From: agl(a)us.ibm.com >X-Xagent-To: wuzhy(a)linux.vnet.ibm.com >X-Xagent-Gateway: vmsdvma.vnet.ibm.com (XAGENTU8 at VMSDVMA) > >On Fri, Sep 02, 2011 at 10:14:48AM +0800, Zhi Yong Wu wrote: >> On Thu, Sep 01, 2011 at 01:05:31PM +0800, Zhi Yong Wu wrote: >> HI, Adam, >> Now stefan, Daniel, and Gui all suggest extending blkiotune to keep libivrt unified interface. What do you think of it? > >It seems like it would be nice to extend the blkiotune API for this use case, >but there is one problem. The blkiotune interface operates at the VM level and >the QEMU throttling is at the disk level. So if you want per-disk throttling >granularity the blkiotune API may not be suitable. I see 3 possible paths >forward: > >1) Accept the blkiotune limitation of a global setting and add a throttle option >that assigns the same throttle value to all disks. > > <blkiotune> > <shares>250</shares> > <throttle>1024</throttle> > </blkiotune> > > + Nice for simplicity and ease of implementation > - May be too simplistic (can't set different throttling for different disks) > > >2) Extend the blkiotune API to allow per-disk tunings: > > <blkiotune> > <shares>250</shares> > <throttle device='virtio-disk0'>1024</throttle> > </blkiotune> > > + Use an existing API > - Unfortunately it doesn't look like this can be done cleanly > > >3) Use a new API virDomainSetBlkDevParameters() to set device specific >tuning parameters: > ><blkiotune> > <shares>250</shares> ></blkiotune> >... ><disk type='file' device='disk'> > <driver name='qemu' type='raw'/> > <source file='...'/> > <target dev='vda' bus='virtio'/> > <blkdevtune> > <throttle>1024</throttle> Several I/O throttling tags should be supported, such as thrbps, thrbpsrd, thrbpswr, thriops, etc. > </blkdevtune> ></disk> > > + Throttle can be specified with the disk it is effecting > - Proliferation of tuning APIs > > >Obviously #1 is the best if you can accept the limitations of the API. #2 would #1 is not accepted by us. If it is adopted, the advantage of QEMU I/O throttling is not used fully. >be nice if we could figure out how to extend virTypedParameter to represent a I guess that #2 is less extendable than #3. >(disk, param) pair. I see #3 as a last resort. Did I miss any other solutions. To be honest, i prefer to #3. At first, i plan to check how blkiotune works currently. >Did I just manage to completely over-complicate this? :) NO, they are nice. thanks. Regards, Zhiyong Wu > >-- >Adam Litke <agl(a)us.ibm.com> >IBM Linux Technology Center

1 0

[libvirt] [test-API][PATCH] Add 2 methods to generate cdrom & floppy XML for test
by Nan Zhang 05 Sep '11

05 Sep '11

add the following 2 functions to utils/Python/xmlbuilder.py * build_cdrom() * build_floppy() --- utils/Python/xmlbuilder.py | 47 +++++++++++++++++++++++++++++++++++++++++- utils/Python/xmlgenerator.py | 15 +++++++------ 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/utils/Python/xmlbuilder.py b/utils/Python/xmlbuilder.py index 78230da..5a0f8c8 100644 --- a/utils/Python/xmlbuilder.py +++ b/utils/Python/xmlbuilder.py @@ -112,6 +112,33 @@ class XmlBuilder: self.write_toxml(disk) return disk.toxml() + def build_cdrom(self, params): + if params.get('hdmodel', None) == None: + params['hdmodel'] = 'ide' + + if params['hdmodel'] == 'ide': + target_dev = 'hdc' + elif params['hdmodel'] == 'scsi': + target_dev = 'sdc' + else: + print 'Wrong cdrom model.' + + cdrom = xmlgenerator.disk_xml(params, True) + if params['guesttype'] == 'xenpv': + cdrom.getElementsByTagName("target")[0].setAttribute("dev", "xvdc") + else: + cdrom.getElementsByTagName("target")[0].setAttribute("dev", + target_dev) + if __DEBUG__: + self.write_toxml(cdrom) + return cdrom.toxml() + + def build_floppy(self, params): + floppy = xmlgenerator.floppy_xml(params) + if __DEBUG__: + self.write_toxml(floppy) + return floppy.toxml() + def build_interface(self, params): interface = xmlgenerator.interface_xml(params) if __DEBUG__: @@ -177,11 +204,29 @@ if __name__ == "__main__": print '=' * 30, 'disk xml', '=' * 30 params['guesttype'] = 'kvm' params['guestname'] = 'foo' - params['imagepath'] = '/images' params['hdmodel'] = 'virtio' diskxml = xmlobj.build_disk(params) + #--------------------- + # get cdrom xml string + #--------------------- + print '=' * 30, 'cdrom xml', '=' * 30 + params['guesttype'] = 'kvm' + params['guestname'] = 'foo' + params['hdmodel'] = 'ide' + params['bootcd'] = '/tmp/cdrom.img' + + cdromxml = xmlobj.build_cdrom(params) + + #--------------------- + # get floppy xml string + #--------------------- + print '=' * 30, 'floppy xml', '=' * 30 + params['floppysource'] = '/tmp/floppy.img' + + floppyxml = xmlobj.build_floppy(params) + #-------------------------- # get interface xml string #-------------------------- diff --git a/utils/Python/xmlgenerator.py b/utils/Python/xmlgenerator.py index c59ca9e..d57dd33 100644 --- a/utils/Python/xmlgenerator.py +++ b/utils/Python/xmlgenerator.py @@ -308,7 +308,7 @@ def disk_xml(params, cdrom = False): params['guestname'] elif hypertype == 'xen': params['imagepath'] = '/var/lib/xen/images' - params['fullimagepath'] = '/var/lib/xen/images' + '/' + \ + params['fullimagepath'] = params['imagepath'] + '/' + \ params['guestname'] else: print 'DO NOT supported hypervisor.' @@ -367,14 +367,15 @@ def disk_xml(params, cdrom = False): def floppy_xml(params): # Disk element floppy = xml.dom.minidom.Document() - disk_element = floppy.createElement('disk') - disk_element.setAttribute('device', 'floppy') - floppy.appendChild(disk_element) + floppy_element = floppy.createElement('disk') + floppy_element.setAttribute('type', 'file') + floppy_element.setAttribute('device', 'floppy') + floppy.appendChild(floppy_element) # Source element source_element = floppy.createElement('source') source_element.setAttribute('file', params['floppysource']) - disk_element.appendChild(source_element) + floppy_element.appendChild(source_element) # Target element target_element = floppy.createElement('target') @@ -384,11 +385,11 @@ def floppy_xml(params): target_element.setAttribute('dev', 'fda') target_element.setAttribute('bus', 'fdc') - disk_element.appendChild(target_element) + floppy_element.appendChild(target_element) # Readonly readonly = floppy.createElement('readonly') - disk_element.appendChild(readonly) + floppy_element.appendChild(readonly) return floppy -- 1.7.4.4

2 1

[libvirt] [PATCH] libvirtd: create run dir when running at non-root user
by xuhj＠linux.vnet.ibm.com 05 Sep '11

05 Sep '11

From: Xu He Jie <xuhj(a)linux.vnet.ibm.com> Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> When libvirtd is running at non-root user, it won't create ${HOME}/.libvirt. It will show error message: 17:44:16.838: 7035: error : virPidFileAcquirePath:322 : Failed to open pid file --- daemon/libvirtd.c | 46 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 14 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 423c3d7..e0004c7 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1249,6 +1249,7 @@ int main(int argc, char **argv) { bool privileged = geteuid() == 0 ? true : false; bool implicit_conf = false; bool use_polkit_dbus; + char *run_dir = NULL; struct option opts[] = { { "verbose", no_argument, &verbose, 1}, @@ -1403,21 +1404,35 @@ int main(int argc, char **argv) { /* Ensure the rundir exists (on tmpfs on some systems) */ if (privileged) { - const char *rundir = LOCALSTATEDIR "/run/libvirt"; - mode_t old_umask; - - old_umask = umask(022); - if (mkdir (rundir, 0755)) { - if (errno != EEXIST) { - char ebuf[1024]; - VIR_ERROR(_("unable to create rundir %s: %s"), rundir, - virStrerror(errno, ebuf, sizeof(ebuf))); - ret = VIR_DAEMON_ERR_RUNDIR; - umask(old_umask); - goto cleanup; - } + run_dir = strdup(LOCALSTATEDIR "/run/libvirt"); + if (!run_dir) { + VIR_ERROR(_("Can't allocate memory")); + goto cleanup; + } + } + else { + char *user_dir = NULL; + + if (!(user_dir = virGetUserDirectory(geteuid()))) { + VIR_ERROR(_("Can't determine user directory")); + goto cleanup; + } + + if (virAsprintf(&run_dir, "%s/.libvirt/", user_dir) < 0) { + VIR_ERROR(_("Can't allocate memory")); + VIR_FREE(user_dir); + goto cleanup; } - umask(old_umask); + + VIR_FREE(user_dir); + } + + if (virFileMakePath(run_dir) < 0) { + char ebuf[1024]; + VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, + virStrerror(errno, ebuf, sizeof(ebuf))); + ret = VIR_DAEMON_ERR_RUNDIR; + goto cleanup; } /* Try to claim the pidfile, exiting if we can't */ @@ -1571,6 +1586,9 @@ cleanup: VIR_FREE(sock_file_ro); VIR_FREE(pid_file); VIR_FREE(remote_config_file); + if (run_dir) + VIR_FREE(run_dir); + daemonConfigFree(config); virLogShutdown(); -- 1.7.4.1

3 3

[libvirt] [PATCH 1/2] Fix error detection in device change
by Philipp Hahn 03 Sep '11

03 Sep '11

According to qemu-kvm/qerror.c all messages start with a capital "Device ", but the current code only scans for the lower case "device ". This results in "virDomainUpdateDeviceFlags()" to not detect locked CD-ROMs and reporting success even in the case of a failure: # virsh qemu-monitor-command "$VM" change\ drive-ide0-0-0\ \"/var/lib/libvirt/images/ucs_2.4-0-sec4-20110714145916-dvd-amd64.iso\" Device 'drive-ide0-0-0' is locked # virsh update-device "$VM" /dev/stdin <<<"<disk type='file' device='cdrom'><driver name='qemu' type='raw'/><source file='/var/lib/libvirt/images/ucs_2.4-0-sec4-20110714145916-dvd-amd64.iso'/><target dev='hda' bus='ide'/><readonly/><alias name='ide0-0-0'/><address type='drive' controller='0' bus='0' unit='0'/></disk>" Device updated successfully Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/qemu/qemu_monitor_text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 52d924a..98d9169 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1064,7 +1064,7 @@ int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, /* If the command failed qemu prints: * device not found, device is locked ... * No message is printed on success it seems */ - if (strstr(reply, "device ")) { + if (c_strcasestr(reply, "device ")) { qemuReportError(VIR_ERR_OPERATION_FAILED, _("could not change media on %s: %s"), devname, reply); goto cleanup; -- 1.7.1

2 4

[libvirt] [v3 00/14] USB improvements and new redirdev
by Marc-André Lureau 03 Sep '11

03 Sep '11

Hei, Here we go with the third version of this patch series that leads to support for various USB controllers, USB hubs, and USB redirection devices. Major change since v2 is the creation of a new element 'redirdev' instead of reusing the existing 'hostdev'. Marc-André Lureau (14): Add various USB devices QEMU_CAPS Split virDomainControllerModel to virDomainControllerModelSCSI Add USB controller models Add a new controller type 'usb' with optionnal 'model' USB controller can have a PCI address child element USB devices gain a new USB address child element Add USB companion controllers support Add USB hub device Modify USB port to be defined as a port path qemu: don't reserve slot 1 if a PIIX3 USB controller is defined there qemu: Don't append 0 at usb id, so that it is compatible with legacy -usb Add a usb1 & usb2 qemuxml2argv test Add "redirdev" redirection device Learn to use spicevmc as a redirection type for usb-redir docs/formatdomain.html.in | 105 +++++- docs/schemas/domain.rng | 100 ++++- src/conf/domain_audit.c | 65 +++ src/conf/domain_audit.h | 5 + src/conf/domain_conf.c | 443 +++++++++++++++++++- src/conf/domain_conf.h | 104 +++++- src/esx/esx_driver.c | 8 +- src/libvirt_private.syms | 11 +- src/qemu/qemu_capabilities.c | 28 ++ src/qemu/qemu_capabilities.h | 9 + src/qemu/qemu_command.c | 342 ++++++++++++++- src/qemu/qemu_command.h | 14 +- src/qemu/qemu_driver.c | 7 + src/qemu/qemu_hotplug.c | 55 +++- src/qemu/qemu_hotplug.h | 3 + src/vmx/vmx.c | 32 +- tests/qemuhelptest.c | 17 +- .../qemuxml2argv-input-usbmouse-addr.args | 1 + .../qemuxml2argv-input-usbmouse-addr.xml | 27 ++ .../qemuxml2argv-usb-controller.args | 1 + .../qemuxml2argv-usb-controller.xml | 16 + tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml | 19 + .../qemuxml2argv-usb-ich9-companion.args | 6 + .../qemuxml2argv-usb-ich9-companion.xml | 30 ++ .../qemuxml2argv-usb-ich9-ehci-addr.args | 1 + .../qemuxml2argv-usb-ich9-ehci-addr.xml | 18 + .../qemuxml2argv-usb-piix3-controller.args | 1 + .../qemuxml2argv-usb-piix3-controller.xml | 16 + tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml | 31 ++ tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 10 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 40 ++ tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 15 + tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml | 74 ++++ tests/qemuxml2argvtest.c | 30 ++ tests/qemuxml2xmltest.c | 2 + tests/xml2vmxtest.c | 2 +- 38 files changed, 1598 insertions(+), 92 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml -- 1.7.6

5 26

[libvirt] [PATCH 0/8] Report disk latency info
by Osier Yang 02 Sep '11

02 Sep '11

This patch series introduces a new API to report the disk latency related information, which is supported by upstream QEMU just a few days ago (commit c488c7f649, Thu Aug 25). Per previous dicussion on the ABI compatiblity, and API design principle, the new API is defined with style: typedef struct _virDomainBlockStatsFlags virDomainBlockStatsFlagsStruct; typedef virDomainBlockStatsFlagsStruct *virDomainBlockStatsFlagsPtr; struct _virDomainBlockStatsFlags { char field[VIR_DOMAIN_BLOCK_STATS_FIELD_LENGTH]; long long value; }; int virDomainBlockStatsFlags (virDomainPtr dom, const char *path, virDomainBlockStatsFlagsPtr params, int *nparams, unsigned int flags) Other points: 1) With the new API, output of virsh command "domblkstat" is different, this might affect the existed scripts. But considering we are even introducing new feilds, so this can be fine? 2) qemuMonitorJSONGetBlockStatsInfo set "*errs = 0" before, it will cause "domblkstat" always print things like "vda errs 0". However, QEMU doesn't support this field. Fixed it in these patches (*errs = -1). And new API qemuDomainBlockStatsFlags won't even set a field for "errs". 3) Is it deserved to update gendispatch.pl to generate remote codes for functions take argument like "virNodeCPUStatsPtr params", "virNodeMemoryStatsPtr params"? All of these argument points to structs has same structure. Perhaps we can define an alias for these structs and generate the remote codes just like for "virTypedParameterPtr params". [PATCH 1/8] latency: Define new public API and structure [PATCH 2/8] latency: Define the internal driver callback [PATCH 3/8] latency: Implemente the public API [PATCH 4/8] latency: Wire up the remote protocol [PATCH 5/8] latency: Update monitor functions for new latency fields [PATCH 6/8] latency: Implemente internal API for qemu driver [PATCH 7/8] latency: Expose the new API for Python binding [PATCH 8/8] latency: Update cmdBlkStats to use new API Regards, Osier

3 24

[libvirt] [PATCH 0/3 v4] Add filesystem pool formatting
by Osier Yang 02 Sep '11

02 Sep '11

The following patches add the ability to format filesystem pools when the appropriate flags are passed to pool build. This patch set introduces two new flags: VIR_STORAGE_POOL_BUILD_NO_OVERWRITE causes the build to probe for an existing pool of the requested type. The build operation formats the filesystem if it does not find an existing filesystem of that type. VIR_STORAGE_POOL_BUILD_OVERWRITE causes the build to format unconditionally. This patch set is mainly based on v3 by Dave Allan. http://www.redhat.com/archives/libvir-list/2010-June/msg00042.html [PATCH 1/3] storage: Add mkfs and libblkid to build system [PATCH 2/3] storage: Add fs pool formatting [PATCH 3/3] storage: Add virsh support for fs pool formating Regards, Osier

2 9

[libvirt] Preparing for next release 0.9.5
by Daniel Veillard 02 Sep '11

02 Sep '11

To try to keep good habits and stay predictable I would suggest to enter development freeze this week-end to plan an upstream release on Friday 2nd Sep or early the following week. I may also switch the libvirt.org server to a new box at that time, but it's not really urgent, th new box would be less powerful, but with overall better network reliability. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [RFC] block I/O throttling: how to enable in libvirt
by Zhi Yong Wu 02 Sep '11

02 Sep '11

----- Forwarded message from Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> ----- Date: Thu, 1 Sep 2011 11:55:17 +0800 From: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> To: Stefan Hajnoczi <stefanha(a)gmail.com> Cc: "Daniel P. Berrange" <berrange(a)redhat.com>, Stefan Hajnoczi <stefanha(a)gmail.com>, Adam Litke <agl(a)us.ibm.com>, Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com>, QEMU Developers <qemu-devel(a)nongnu.org>, guijianfeng(a)cn.fujitsu.com, hutao(a)cn.fujitsu.com Subject: [RFC] block I/O throttling: how to enable in libvirt Message-ID: <20110901035517.GD16985(a)f15.cn.ibm.com> References: <CAEH94Li_C=BOe2gV8NyM48njYWMBAo9MTGc1eUOh-Y=cODs6VA(a)mail.gmail.com> <CAJSP0QW1CPCokX=F5z7y==vn1S4wH0VtOaQ7oj4kC7f7uQM4MQ(a)mail.gmail.com> <20110830134636.GB29130(a)aglitke.rchland.ibm.com> <CAJSP0QUHm=y8XJC_KXRg7ufFZt3K_XDDfQb--sxjC+c0GjO8qg(a)mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <CAJSP0QUHm=y8XJC_KXRg7ufFZt3K_XDDfQb--sxjC+c0GjO8qg(a)mail.gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Xagent-From: wuzhy(a)linux.vnet.ibm.com X-Xagent-To: wuzhy(a)linux.vnet.ibm.com X-Xagent-Gateway: vmsdvma.vnet.ibm.com (XAGENTU7 at VMSDVMA) On Wed, Aug 31, 2011 at 08:18:19AM +0100, Stefan Hajnoczi wrote: >Subject: Re: The design choice for how to enable block I/O throttling > function in libvirt >From: Stefan Hajnoczi <stefanha(a)gmail.com> >To: Adam Litke <agl(a)us.ibm.com> >Cc: libvir-list(a)redhat.com, "Daniel P. Berrange" <berrange(a)redhat.com>, Zhi > Yong Wu <wuzhy(a)linux.vnet.ibm.com>, Zhi Yong Wu <zwu.kernel(a)gmail.com> >Content-Type: text/plain; charset=ISO-8859-1 >Content-Transfer-Encoding: quoted-printable >X-Brightmail-Tracker: AAAAAA== >X-Xagent-From: stefanha(a)gmail.com >X-Xagent-To: wuzhy(a)linux.vnet.ibm.com >X-Xagent-Gateway: bldgate.vnet.ibm.com (XAGENTU7 at BLDGATE) > >On Tue, Aug 30, 2011 at 2:46 PM, Adam Litke <agl(a)us.ibm.com> wrote: >> On Tue, Aug 30, 2011 at 09:53:33AM +0100, Stefan Hajnoczi wrote: >>> On Tue, Aug 30, 2011 at 3:55 AM, Zhi Yong Wu <zwu.kernel(a)gmail.com> wrote: >>> > I am trying to enable block I/O throttling function in libvirt. But >>> > currently i met some design questions, and don't make sure if we >>> > should extend blkiotune to support block I/O throttling or introduce >>> > one new libvirt command "blkiothrottle" to cover it or not. If you >>> > have some better idea, pls don't hesitate to drop your comments. >>> >>> A little bit of context: this discussion is about adding libvirt >>> support for QEMU disk I/O throttling. >> >> Thanks for the additional context Stefan. >> >>> Today libvirt supports the cgroups blkio-controller, which handles >>> proportional shares and throughput/iops limits on host block devices. >>> blkio-controller does not support network file systems (NFS) or other >>> QEMU remote block drivers (curl, Ceph/rbd, sheepdog) since they are >>> not host block devices. QEMU I/O throttling works with all types of >>> -drive and therefore complements blkio-controller. >> >> The first question that pops into my mind is: Should a user need to understand >> when to use the cgroups blkio-controller vs. the QEMU I/O throttling method? In >> my opinion, it would be nice if libvirt had a single interface for block I/O >> throttling and libvirt would decide which mechanism to use based on the type of >> device and the specific limits that need to be set. > >Yes, I agree it would be simplest to pick the right mechanism, >depending on the type of throttling the user wants. More below. > >>> I/O throttling can be applied independently to each -drive attached to >>> a guest and supports throughput/iops limits. For more information on >>> this QEMU feature and a comparison with blkio-controller, see Ryan >>> Harper's KVM Forum 2011 presentation: >> >>> http://www.linux-kvm.org/wiki/images/7/72/2011-forum-keep-a-limit-on-it-io-… >> >> From the presentation, it seems that both the cgroups method the the qemu method >> offer comparable control (assuming a block device) so it might possible to apply >> either method from the same API in a transparent manner. Am I correct or are we >> suggesting that the Qemu throttling approach should always be used for Qemu >> domains? > >QEMU I/O throttling does not provide a proportional share mechanism. >So you cannot assign weights to VMs and let them receive a fraction of >the available disk time. That is only supported by cgroups >blkio-controller because it requires a global view which QEMU does not >have. > >So I think the two are complementary: > >If proportional share should be used on a host block device, use >cgroups blkio-controller. >Otherwise use QEMU I/O throttling. Stefan, Do you agree with introducing one new libvirt command blkiothrottle now? If so, i will work on the code draft to make it work. Daniel and other maintainers, If you are available, can you make some comments for us?:) Regards, Zhi Yong Wu > >Stefan ----- End forwarded message -----

4 10

[libvirt] [test-API][PATCH] Add libvirtd restart test case
by Wayne Sun 02 Sep '11

02 Sep '11

* libvirtd restart should not affect the running domains. This test check the libvirtd status before and after libvirtd restart, and also by checking the domain pid to confirm the domain is not affected. --- repos/libvirtd/restart.py | 143 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 143 insertions(+), 0 deletions(-) create mode 100644 repos/libvirtd/restart.py diff --git a/repos/libvirtd/restart.py b/repos/libvirtd/restart.py new file mode 100644 index 0000000..15dd43c --- /dev/null +++ b/repos/libvirtd/restart.py @@ -0,0 +1,143 @@ +#!/usr/bin/evn python +""" Restart libvirtd testing. A running guest is required in this test. + During libvirtd restart, the guest remains running and not affected + by libvirtd restart. + libvirtd:restart + guestname + #GUESTNAME# +""" + +__author__ = 'Wayne Sun: gsun(a)redhat.com' +__date__ = 'Thu Aug 4, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['restart'] + +import os +import re +import sys +import time + +def append_path(path): + """Append root path of package""" + if path not in sys.path: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils + +VIRSH_LIST = "virsh list --all" +RESTART_CMD = "service libvirtd restart" + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + return 1 + return 0 + +def libvirtd_check(util, logger): + """check libvirtd status + """ + cmd = "service libvirtd status" + ret, out = util.exec_cmd(cmd, shell=True) + if ret != 0: + logger.error("failed to get libvirtd status") + return 1 + else: + logger.info(out[0]) + + logger.info(VIRSH_LIST) + ret, out = util.exec_cmd(VIRSH_LIST, shell=True) + if ret != 0: + logger.error("failed to get virsh list result") + return 1 + else: + for i in range(len(out)): + logger.info(out[i]) + + return 0 + +def get_domain_pid(util, logger, guestname): + """get the pid of running domain""" + logger.info("get the pid of running domain %s" % guestname) + get_pid_cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname + ret, pid = util.exec_cmd(get_pid_cmd, shell=True) + if ret: + logger.error("fail to get the pid of runnings domain %s" % \ + guestname) + return 1, "" + else: + logger.info("the pid of domain %s is %s" % \ + (guestname, pid[0])) + return 0, pid[0] + +def restart(params): + """restart libvirtd test""" + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + + logger = params['logger'] + guestname = params['guestname'] + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + domobj = domainAPI.DomainAPI(virconn) + state = domobj.get_state(guestname) + conn.close() + + if(state == "shutoff"): + logger.info("guest is shutoff, if u want to run this case, \ + guest must be running") + return 1 + + logger.info("check the libvirtd status:") + result = libvirtd_check(util, logger) + if result: + return 1 + + ret, pid_before = get_domain_pid(util, logger, guestname) + if ret: + return 1 + + logger.info("restart libvirtd service:") + ret, out = util.exec_cmd(RESTART_CMD, shell=True) + if ret != 0: + logger.error("failed to restart libvirtd") + for i in range(len(out)): + logger.error(out[i]) + return 1 + else: + for i in range(len(out)): + logger.info(out[i]) + + logger.info("recheck libvirtd status:") + result = libvirtd_check(util, logger) + if result: + return 1 + + ret, pid_after = get_domain_pid(util, logger, guestname) + if ret: + return 1 + + if pid_before != pid_after: + logger.error("%s pid changed during libvirtd restart" % \ + guestname) + return 1 + else: + logger.info("domain pid not change, %s keeps running during \ + libvirtd restart" % guestname) + + return 0 -- 1.7.1

3 2

[libvirt] [PATCH] API: Init conn in case of it might be used uninitialized
by Osier Yang 02 Sep '11

02 Sep '11

There is a goto before "conn" is initialized. --- src/libvirt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 4284954..eca919a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -15225,12 +15225,13 @@ virDomainMigrateGetMaxSpeed(virDomainPtr domain, return -1; } + conn = domain->conn; + if (!bandwidth) { virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - conn = domain->conn; if (conn->flags & VIR_CONNECT_RO) { virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); goto error; -- 1.7.6

2 2

[libvirt] [test-API][PATCH 1/2] Remove cases/migrate.conf testcases and create a set of migration testcases
by Guannan Ren 02 Sep '11

02 Sep '11

*cases/migrate.conf remove it. *cases/migration/* create a new set of migraion testcases with tcp, tls and sasl combination It's huge, so I send the header of commit here. --- cases/migrate.conf | 97 ---- cases/migration/ssh_persistent_paused_no_dst.conf | 459 +++++++++++++++++++ .../migration/ssh_persistent_paused_with_dst.conf | 459 +++++++++++++++++++ cases/migration/ssh_persistent_running_no_dst.conf | 435 ++++++++++++++++++ .../migration/ssh_persistent_running_with_dst.conf | 435 ++++++++++++++++++ cases/migration/ssh_transient_paused_no_dst.conf | 403 +++++++++++++++++ cases/migration/ssh_transient_paused_with_dst.conf | 403 +++++++++++++++++ cases/migration/ssh_transient_running_no_dst.conf | 388 ++++++++++++++++ .../migration/ssh_transient_running_with_dst.conf | 382 ++++++++++++++++ cases/migration/tcp_persistent_paused_no_dst.conf | 471 ++++++++++++++++++++ .../migration/tcp_persistent_paused_with_dst.conf | 471 ++++++++++++++++++++ cases/migration/tcp_persistent_running_no_dst.conf | 447 +++++++++++++++++++ .../migration/tcp_persistent_running_with_dst.conf | 447 +++++++++++++++++++ .../tcp_sasl_persistent_paused_no_dst.conf | 167 +++++++ .../tcp_sasl_persistent_paused_with_dst.conf | 168 +++++++ .../tcp_sasl_persistent_running_no_dst.conf | 159 +++++++ .../tcp_sasl_persistent_running_with_dst.conf | 159 +++++++ .../tcp_sasl_transient_paused_no_dst.conf | 151 +++++++ .../tcp_sasl_transient_paused_with_dst.conf | 151 +++++++ .../tcp_sasl_transient_running_no_dst.conf | 143 ++++++ .../tcp_sasl_transient_running_with_dst.conf | 143 ++++++ cases/migration/tcp_transient_paused_no_dst.conf | 415 +++++++++++++++++ cases/migration/tcp_transient_paused_with_dst.conf | 415 +++++++++++++++++ cases/migration/tcp_transient_running_no_dst.conf | 400 +++++++++++++++++ .../migration/tcp_transient_running_with_dst.conf | 394 ++++++++++++++++ cases/migration/tls_persistent_paused_no_dst.conf | 471 ++++++++++++++++++++ .../migration/tls_persistent_paused_with_dst.conf | 471 ++++++++++++++++++++ cases/migration/tls_persistent_running_no_dst.conf | 447 +++++++++++++++++++ .../migration/tls_persistent_running_with_dst.conf | 447 +++++++++++++++++++ .../tls_sasl_persistent_paused_no_dst.conf | 167 +++++++ .../tls_sasl_persistent_paused_with_dst.conf | 167 +++++++ .../tls_sasl_persistent_running_no_dst.conf | 159 +++++++ .../tls_sasl_persistent_running_with_dst.conf | 159 +++++++ .../tls_sasl_transient_paused_no_dst.conf | 151 +++++++ .../tls_sasl_transient_paused_with_dst.conf | 151 +++++++ .../tls_sasl_transient_running_no_dst.conf | 143 ++++++ .../tls_sasl_transient_running_with_dst.conf | 143 ++++++ cases/migration/tls_transient_paused_no_dst.conf | 415 +++++++++++++++++ cases/migration/tls_transient_paused_with_dst.conf | 415 +++++++++++++++++ cases/migration/tls_transient_running_no_dst.conf | 400 +++++++++++++++++ .../migration/tls_transient_running_with_dst.conf | 394 ++++++++++++++++ 41 files changed, 12765 insertions(+), 97 deletions(-) delete mode 100644 cases/migrate.conf create mode 100644 cases/migration/ssh_persistent_paused_no_dst.conf create mode 100644 cases/migration/ssh_persistent_paused_with_dst.conf create mode 100644 cases/migration/ssh_persistent_running_no_dst.conf create mode 100644 cases/migration/ssh_persistent_running_with_dst.conf create mode 100644 cases/migration/ssh_transient_paused_no_dst.conf create mode 100644 cases/migration/ssh_transient_paused_with_dst.conf create mode 100644 cases/migration/ssh_transient_running_no_dst.conf create mode 100644 cases/migration/ssh_transient_running_with_dst.conf create mode 100644 cases/migration/tcp_persistent_paused_no_dst.conf create mode 100644 cases/migration/tcp_persistent_paused_with_dst.conf create mode 100644 cases/migration/tcp_persistent_running_no_dst.conf create mode 100644 cases/migration/tcp_persistent_running_with_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_paused_no_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_paused_with_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_running_no_dst.conf create mode 100644 cases/migration/tcp_sasl_persistent_running_with_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_paused_no_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_paused_with_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_running_no_dst.conf create mode 100644 cases/migration/tcp_sasl_transient_running_with_dst.conf create mode 100644 cases/migration/tcp_transient_paused_no_dst.conf create mode 100644 cases/migration/tcp_transient_paused_with_dst.conf create mode 100644 cases/migration/tcp_transient_running_no_dst.conf create mode 100644 cases/migration/tcp_transient_running_with_dst.conf create mode 100644 cases/migration/tls_persistent_paused_no_dst.conf create mode 100644 cases/migration/tls_persistent_paused_with_dst.conf create mode 100644 cases/migration/tls_persistent_running_no_dst.conf create mode 100644 cases/migration/tls_persistent_running_with_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_paused_no_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_paused_with_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_running_no_dst.conf create mode 100644 cases/migration/tls_sasl_persistent_running_with_dst.conf create mode 100644 cases/migration/tls_sasl_transient_paused_no_dst.conf create mode 100644 cases/migration/tls_sasl_transient_paused_with_dst.conf create mode 100644 cases/migration/tls_sasl_transient_running_no_dst.conf create mode 100644 cases/migration/tls_sasl_transient_running_with_dst.conf create mode 100644 cases/migration/tls_transient_paused_no_dst.conf create mode 100644 cases/migration/tls_transient_paused_with_dst.conf create mode 100644 cases/migration/tls_transient_running_no_dst.conf create mode 100644 cases/migration/tls_transient_running_with_dst.conf

1 1

[libvirt] [RFC] NUMA topology specification
by Bharata B Rao 02 Sep '11

02 Sep '11

Hi, qemu supports specification of NUMA topology on command line using -numa option. -numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] I see that there is no way to specify such NUMA topology in libvirt XML. Are there plans to add support for NUMA topology specification ? Is anybody already working on this ? If not I would like to add this support for libvirt. Currently the topology specification available in libvirt ( <topology sockets='1' cores='2' threads='1'/>) translates to "-smp sockets=1,cores=2,threads=1" option of qemu. There is not equivalent in libvirt that could generate -numa command line option of qemu. How about something like this ? (OPTION 1) <cpu> ... <numa nodeid='node' cpus='cpu[-cpu]' mem='size'> ... </cpu> And we could specify multiple such lines, one for each node. -numa and -smp options in qemu do not work all that well since they are parsed independent of each other and one could specify a cpu set with -numa option that is incompatible with sockets,cores and threads specified on -smp option. This should be fixed in qemu, but given that such a problem has been observed, should libvirt tie the specification of numa and smp (sockets,threads,cores) together so that one is forced to specify only valid combinations of nodes and cpus in libvirt ? May be something like this: (OPTION 2) <cpu> ... <topology sockets='1' cores='2' threads='1' nodeid='0' cpus='0-1' mem='size'> <topology sockets='1' cores='2' threads='1' nodeid='1' cpus='2-3' mem='size'> ... </cpu This should result in a 2 node system with each node having 1 socket with 2 cores. Comments, suggestions ? Regards, Bharata. -- http://bharata.sulekha.com/blog/posts.htm, http://raobharata.wordpress.com/

4 11

[libvirt] [PATCH] start: allow discarding managed save
by Eric Blake 02 Sep '11

02 Sep '11

There have been several instances of people having problems with a broken managed save file causing 'virsh start' to fail, and not being aware that they could use 'virsh managedsave-remove dom' to fix things. Making it possible to do this as part of starting a domain makes the same functionality easier to find, and one less API call. * include/libvirt/libvirt.h.in (VIR_DOMAIN_START_FORCE_BOOT): New flag. * src/libvirt.c (virDomainCreateWithFlags): Document it. * src/qemu/qemu_driver.c (qemuDomainObjStart): Alter signature. (qemuAutostartDomain, qemuDomainStartWithFlags): Update callers. * tools/virsh.c (cmdStart): Expose it in virsh. * tools/virsh.pod (start): Document it. --- include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 3 ++ src/qemu/qemu_driver.c | 50 +++++++++++++++++++++++++---------------- tools/virsh.c | 7 +++++- tools/virsh.pod | 5 ++- 5 files changed, 43 insertions(+), 23 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 53a2f7d..c51a5b9 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -236,6 +236,7 @@ typedef enum { VIR_DOMAIN_START_PAUSED = 1 << 0, /* Launch guest in paused state */ VIR_DOMAIN_START_AUTODESTROY = 1 << 1, /* Automatically kill guest when virConnectPtr is closed */ VIR_DOMAIN_START_BYPASS_CACHE = 1 << 2, /* Avoid file system cache pollution */ + VIR_DOMAIN_START_FORCE_BOOT = 1 << 3, /* Boot, discarding any managed save */ } virDomainCreateFlags; diff --git a/src/libvirt.c b/src/libvirt.c index 65a099b..80c8b7c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7081,6 +7081,9 @@ error: * the file, or fail if it cannot do so for the given system; this can allow * less pressure on file system cache, but also risks slowing loads from NFS. * + * If the VIR_DOMAIN_START_FORCE_BOOT flag is set, then any managed save + * file for this domain is discarded, and the domain boots from scratch. + * * Returns 0 in case of success, -1 in case of error */ int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f21122d..5033998 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -120,9 +120,7 @@ static int qemudShutdown(void); static int qemuDomainObjStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, - bool start_paused, - bool autodestroy, - bool bypass_cache); + unsigned int flags); static int qemudDomainGetMaxVcpus(virDomainPtr dom); @@ -135,11 +133,16 @@ struct qemuAutostartData { }; static void -qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) +qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, + void *opaque) { virDomainObjPtr vm = payload; struct qemuAutostartData *data = opaque; virErrorPtr err; + int flags = 0; + + if (data->driver->autoStartBypassCache) + flags |= VIR_DOMAIN_START_BYPASS_CACHE; virDomainObjLock(vm); virResetLastError(); @@ -152,9 +155,7 @@ qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaq } else { if (vm->autostart && !virDomainObjIsActive(vm) && - qemuDomainObjStart(data->conn, data->driver, vm, - false, false, - data->driver->autoStartBypassCache) < 0) { + qemuDomainObjStart(data->conn, data->driver, vm, flags) < 0) { err = virGetLastError(); VIR_ERROR(_("Failed to autostart VM '%s': %s"), vm->def->name, @@ -4441,12 +4442,14 @@ static int qemuDomainObjStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, - bool start_paused, - bool autodestroy, - bool bypass_cache) + unsigned int flags) { int ret = -1; char *managed_save; + bool start_paused = (flags & VIR_DOMAIN_START_PAUSED) != 0; + bool autodestroy = (flags & VIR_DOMAIN_START_AUTODESTROY) != 0; + bool bypass_cache = (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0; + bool force_boot = (flags & VIR_DOMAIN_START_FORCE_BOOT) != 0; /* * If there is a managed saved state restore it instead of starting @@ -4458,13 +4461,22 @@ qemuDomainObjStart(virConnectPtr conn, goto cleanup; if (virFileExists(managed_save)) { - ret = qemuDomainObjRestore(conn, driver, vm, managed_save, - bypass_cache); + if (force_boot) { + if (unlink(managed_save) < 0) { + virReportSystemError(errno, + _("cannot remove managed save file %s"), + managed_save); + goto cleanup; + } + } else { + ret = qemuDomainObjRestore(conn, driver, vm, managed_save, + bypass_cache); - if ((ret == 0) && (unlink(managed_save) < 0)) - VIR_WARN("Failed to remove the managed state %s", managed_save); + if ((ret == 0) && (unlink(managed_save) < 0)) + VIR_WARN("Failed to remove the managed state %s", managed_save); - goto cleanup; + goto cleanup; + } } ret = qemuProcessStart(conn, driver, vm, NULL, start_paused, @@ -4493,7 +4505,8 @@ qemuDomainStartWithFlags(virDomainPtr dom, unsigned int flags) virCheckFlags(VIR_DOMAIN_START_PAUSED | VIR_DOMAIN_START_AUTODESTROY | - VIR_DOMAIN_START_BYPASS_CACHE, -1); + VIR_DOMAIN_START_BYPASS_CACHE | + VIR_DOMAIN_START_FORCE_BOOT, -1); qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -4515,10 +4528,7 @@ qemuDomainStartWithFlags(virDomainPtr dom, unsigned int flags) goto endjob; } - if (qemuDomainObjStart(dom->conn, driver, vm, - (flags & VIR_DOMAIN_START_PAUSED) != 0, - (flags & VIR_DOMAIN_START_AUTODESTROY) != 0, - (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0) < 0) + if (qemuDomainObjStart(dom->conn, driver, vm, flags) < 0) goto endjob; ret = 0; diff --git a/tools/virsh.c b/tools/virsh.c index 15b9bdd..49034ae 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1537,9 +1537,12 @@ static const vshCmdOptDef opts_start[] = { {"console", VSH_OT_BOOL, 0, N_("attach to console after creation")}, #endif {"paused", VSH_OT_BOOL, 0, N_("leave the guest paused after creation")}, - {"autodestroy", VSH_OT_BOOL, 0, N_("automatically destroy the guest when virsh disconnects")}, + {"autodestroy", VSH_OT_BOOL, 0, + N_("automatically destroy the guest when virsh disconnects")}, {"bypass-cache", VSH_OT_BOOL, 0, N_("avoid file system cache when loading")}, + {"force-boot", VSH_OT_BOOL, 0, + N_("force fresh boot by discarding any managed save")}, {NULL, 0, 0, NULL} }; @@ -1572,6 +1575,8 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_START_AUTODESTROY; if (vshCommandOptBool(cmd, "bypass-cache")) flags |= VIR_DOMAIN_START_BYPASS_CACHE; + if (vshCommandOptBool(cmd, "force-boot")) + flags |= VIR_DOMAIN_START_FORCE_BOOT; /* Prefer older API unless we have to pass a flag. */ if ((flags ? virDomainCreateWithFlags(dom, flags) diff --git a/tools/virsh.pod b/tools/virsh.pod index 81d7a1e..2cd0f73 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -890,7 +890,7 @@ The exact behavior of a domain when it shuts down is set by the I<on_shutdown> parameter in the domain's XML definition. =item B<start> I<domain-name> [I<--console>] [I<--paused>] [I<--autodestroy>] -[I<--bypass-cache>] +[I<--bypass-cache>] [I<--force-boot>] Start a (previously defined) inactive domain, either from the last B<managedsave> state, or via a fresh boot if no managedsave state is @@ -901,7 +901,8 @@ If I<--autodestroy> is requested, then the guest will be automatically destroyed when virsh closes its connection to libvirt, or otherwise exits. If I<--bypass-cache> is specified, and managedsave state exists, the restore will avoid the file system cache, although this may slow -down the operation. +down the operation. If I<--force-boot> is specified, then any +managedsave state is discarded and a fresh boot occurs. =item B<suspend> I<domain-id> -- 1.7.4.4

3 10

[libvirt] [PATCH] reserve slot 1 on pci bus0
by Wen Congyang 02 Sep '11

02 Sep '11

After supporting multi function pci device, we only reserve function 1 on slot 1. The user can use the other function on slot 1 in the xml config file. We should detect this wrong usage. --- src/qemu/qemu_command.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 287ad8d..4b5734c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1072,6 +1072,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) int i; bool reservedIDE = false; bool reservedVGA = false; + int function; /* Host bridge */ if (qemuDomainPCIAddressReserveSlot(addrs, 0) < 0) @@ -1107,9 +1108,14 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) * hardcoded slot=1, multifunction device */ - if (!reservedIDE && - qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) - goto error; + for (function = 0; function <= QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) { + if (function == 1 && reservedIDE) + /* we have reserved this pci address */ + continue; + + if (qemuDomainPCIAddressReserveFunction(addrs, 1, function) < 0) + goto error; + } /* First VGA is hardcoded slot=2 */ if (def->nvideos > 0) { -- 1.7.1

2 4

[libvirt] [PATCH] virsh: avoid memory leak on cmdVolCreateAs
by ajia＠redhat.com 02 Sep '11

02 Sep '11

* tools/virsh.c: fix memory leak on cmdVolCreateAs function. * Detected in valgrind run: ==4746== ==4746== 48 (40 direct, 8 indirect) bytes in 1 blocks are definitely lost in loss record 26 of 52 ==4746== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==4746== by 0x4C76E51: virAlloc (memory.c:101) ==4746== by 0x4CD9418: virGetStoragePool (datatypes.c:592) ==4746== by 0x4D21367: remoteStoragePoolLookupByName (remote_driver.c:4126) ==4746== by 0x4CE42B0: virStoragePoolLookupByName (libvirt.c:10232) ==4746== by 0x40C276: vshCommandOptPoolBy (virsh.c:13660) ==4746== by 0x40CA37: cmdVolCreateAs (virsh.c:8094) ==4746== by 0x412AF2: vshCommandRun (virsh.c:13770) ==4746== by 0x422F11: main (virsh.c:15127) ==4746== ==4746== 1,011 bytes in 1 blocks are definitely lost in loss record 45 of 52 ==4746== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==4746== by 0x4A06167: realloc (vg_replace_malloc.c:525) ==4746== by 0x4C76ECB: virReallocN (memory.c:161) ==4746== by 0x4C60319: virBufferGrow (buf.c:72) ==4746== by 0x4C606AA: virBufferAdd (buf.c:106) ==4746== by 0x40CB37: cmdVolCreateAs (virsh.c:8118) ==4746== by 0x412AF2: vshCommandRun (virsh.c:13770) ==4746== by 0x422F11: main (virsh.c:15127) ==4746== ==4746== LEAK SUMMARY: ==4746== definitely lost: 1,051 bytes in 2 blocks ==4746== indirectly lost: 8 bytes in 1 blocks ==4746== possibly lost: 0 bytes in 0 blocks ==4746== still reachable: 390,767 bytes in 1,373 blocks ==4746== suppressed: 0 bytes in 0 blocks * How to reproduce? % valgrind -v --leak-check=full virsh vol-create-as default foo.img 10M \ --allocation 0 --format qcow2 --backing-vol bar.img Notes: bar.img doesn't exist. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f9bcd2c..44c2f1c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8166,7 +8166,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) } if (snapVol == NULL) { vshError(ctl, _("failed to get vol '%s'"), snapshotStrVol); - return false; + goto cleanup; } char *snapshotStrVolPath; -- 1.7.1

3 2

[libvirt] [PATCH] lxc: do not require 'ifconfig' or 'ipconfig' in container
by Scott Moser 02 Sep '11

02 Sep '11

Currently, the lxc implementation invokes 'ip' and 'ifconfig' commands inside a container using 'virRun'. That has the side effect of requiring those commands to be present and to function in a manner consistent with the usage. Some small roots (such as ttylinux) may not have 'ip' or 'ifconfig'. This patch replaces the use of these commands with usage of netdevice. The result is that lxc containers do not have to implement those commands, and lxc in libvirt is only dependent on the netdevice interface. I've tested this patch locally against the ubuntu libvirt version enough to verify its generally sane. I attempted to build upstream today, but failed with: /usr/bin/ld: ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_domain.o): undefined reference to symbol 'xmlXPathRegisterNs@@LIBXML2_2.4.30 Thats probably a local issue only, but I wanted to get this patch up and see what others thought of it. This is ubuntu bug https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/828211 . diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 34cb804..c24df91 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -12,8 +12,11 @@ #include <config.h> +#include <linux/sockios.h> +#include <net/if.h> #include <string.h> #include <stdio.h> +#include <sys/ioctl.h> #include <sys/types.h> #include <sys/wait.h> @@ -186,41 +189,49 @@ int vethDelete(const char *veth) * @veth: name of veth device * @upOrDown: 0 => down, 1 => up * - * Enables a veth device using the ifconfig command. A NULL inetAddress - * will cause it to be left off the command line. + * Enables a veth device using SIOCSIFFLAGS * - * Returns 0 on success or -1 in case of error + * Returns 0 on success, -1 on failure, with errno set */ int vethInterfaceUpOrDown(const char* veth, int upOrDown) { - int rc; - const char *argv[] = {"ifconfig", veth, NULL, NULL}; - int cmdResult = 0; + struct ifreq ifr; + int fd, ret; - if (0 == upOrDown) - argv[2] = "down"; - else - argv[2] = "up"; + if ((fd = socket(PF_PACKET, SOCK_DGRAM, 0)) == -1) + return(-1); - rc = virRun(argv, &cmdResult); + memset(&ifr, 0, sizeof(struct ifreq)); - if (rc != 0 || - (WIFEXITED(cmdResult) && WEXITSTATUS(cmdResult) != 0)) { - if (0 == upOrDown) + if (virStrcpyStatic(ifr.ifr_name, veth) == NULL) { + errno = EINVAL; + return -1; + } + + if ((ret = ioctl(fd, SIOCGIFFLAGS, &ifr)) == 0) { + if (upOrDown) + ifr.ifr_flags |= IFF_UP; + else + ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING); + + ret = ioctl(fd, SIOCSIFFLAGS, &ifr); + } + + close(fd); + if (ret == -1) + if (upOrDown == 0) /* * Prevent overwriting an error log which may be set * where an actual failure occurs. */ - VIR_DEBUG("Failed to disable '%s' (%d)", - veth, WEXITSTATUS(cmdResult)); + VIR_DEBUG("Failed to disable '%s'", veth); else vethError(VIR_ERR_INTERNAL_ERROR, - _("Failed to enable '%s' (%d)"), - veth, WEXITSTATUS(cmdResult)); - rc = -1; - } + _("Failed to enable '%s'"), veth); + else + ret = 0; - return rc; + return(ret); } /** @@ -279,17 +290,29 @@ int setMacAddr(const char* iface, const char* macaddr) * @iface: name of device * @new: new name of @iface * - * Changes the name of the given device with the - * given new name using this command: - * ip link set @iface name @new + * Changes the name of the given device. * - * Returns 0 on success or -1 in case of error + * Returns 0 on success, -1 on failure with errno set. */ int setInterfaceName(const char* iface, const char* new) { - const char *argv[] = { - "ip", "link", "set", iface, "name", new, NULL - }; + struct ifreq ifr; + int fd = socket(PF_PACKET, SOCK_DGRAM, 0); - return virRun(argv, NULL); + memset(&ifr, 0, sizeof(struct ifreq)); + + if (virStrcpyStatic(ifr.ifr_name, iface) == NULL) { + errno = EINVAL; + return -1; + } + + if (virStrcpyStatic(ifr.ifr_newname, new) == NULL) { + errno = EINVAL; + return -1; + } + + if (ioctl(fd, SIOCSIFNAME, &ifr)) + return -1; + + return 0; }

4 3

[libvirt] [RFC] Create ptmx as a device
by Serge Hallyn 02 Sep '11

02 Sep '11

Hi, I'm seeing an issue with udev and libvirt-lxc. Libvirt-lxc creates /dev/ptmx as a symlink to /dev/pts/ptmx. When udev starts up, it checks the device type, sees ptmx is 'not right', and replaces it with a 'proper' ptmx. In lxc, /dev/ptmx is bind-mounted from /dev/pts/ptmx instead of being symlinked, so udev sees the right device type and leaves it alone. A patch like the following seems to work for me. Would there be any objections to this? >From 4c5035de52de7e06a0de9c5d0bab8c87a806cba7 Mon Sep 17 00:00:00 2001 From: Ubuntu <ubuntu(a)domU-12-31-39-14-F0-B3.compute-1.internal> Date: Wed, 31 Aug 2011 18:15:54 +0000 Subject: [PATCH 1/1] make ptmx a bind mount rather than symlink udev on some systems checks the device type of /dev/ptmx, and replaces it if not as expected. The symlink created by libvirt-lxc therefore gets replaced. By creating it as a bind mount, the device type is correct and udev leaves it alone. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/lxc/lxc_container.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index e425328..6991aec 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -543,18 +543,18 @@ static int lxcContainerPopulateDevices(void) } } + dev_t dev = makedev(LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX); + if (mknod("/dev/ptmx", S_IFCHR, dev) < 0 || + chmod("/dev/ptmx", 0666)) { + virReportSystemError(errno, "%s", + _("Failed to make device /dev/ptmx")); + return -1; + } + if (access("/dev/pts/ptmx", W_OK) == 0) { - if (symlink("/dev/pts/ptmx", "/dev/ptmx") < 0) { - virReportSystemError(errno, "%s", - _("Failed to create symlink /dev/ptmx to /dev/pts/ptmx")); - return -1; - } - } else { - dev_t dev = makedev(LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX); - if (mknod("/dev/ptmx", S_IFCHR, dev) < 0 || - chmod("/dev/ptmx", 0666)) { + if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) { virReportSystemError(errno, "%s", - _("Failed to make device /dev/ptmx")); + _("Failed to bind-mount /dev/ptmx to /dev/pts/ptmx")); return -1; } } -- 1.7.5.4

4 6

[libvirt] [PATCH 1/2] BlockJob: Bandwidth parameter is in MB when using text monitor
by Adam Litke 02 Sep '11

02 Sep '11

Due to an unfortunate precedent in qemu, the units for the bandwidth parameter to block_job_set_speed are different between the text monitor and the qmp monitor. While the qmp monitor uses bytes/s, the text monitor expects MB/s. Correct the units for the text interface. Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- src/qemu/qemu_monitor_text.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index f37c98c..854ee7f 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -3067,8 +3067,7 @@ int qemuMonitorTextBlockJob(qemuMonitorPtr mon, ret = virAsprintf(&cmd, "%s", cmd_name); } else if (mode == BLOCK_JOB_SPEED) { cmd_name = "block_job_set_speed"; - ret = virAsprintf(&cmd, "%s %s %llu", cmd_name, device, - bandwidth * 1024ULL * 1024ULL); + ret = virAsprintf(&cmd, "%s %s %luM", cmd_name, device, bandwidth); } else if (mode == BLOCK_JOB_PULL) { cmd_name = "block_stream"; ret = virAsprintf(&cmd, "%s %s", cmd_name, device); -- 1.7.3

3 4

[libvirt] [PATCH] BlockPull: Set initial bandwidth limit if specified
by Adam Litke 02 Sep '11

02 Sep '11

The libvirt BlockPull API supports the use of an initial bandwidth limit but the qemu block_stream API does not. To get the desired behavior we use the two APIs strung together: first BlockPull, then BlockJobSetSpeed. We can do this at the driver level to avoid duplicated code in each monitor path. Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- src/qemu/qemu_driver.c | 8 +++++++- src/qemu/qemu_monitor_json.c | 4 ---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4e8c691..7476bb4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9418,8 +9418,14 @@ static int qemuDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags) { + int ret; + virCheckFlags(0, -1); - return qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, BLOCK_JOB_PULL); + ret = qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, BLOCK_JOB_PULL); + if (ret == 0 && bandwidth != 0) + ret = qemuDomainBlockJobImpl(dom, path, bandwidth, NULL, + BLOCK_JOB_SPEED); + return ret; } static virDriver qemuDriver = { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 715b26e..4ceb536 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2956,10 +2956,6 @@ int qemuMonitorJSONBlockJob(qemuMonitorPtr mon, if (ret == 0 && mode == BLOCK_JOB_INFO) ret = qemuMonitorJSONGetBlockJobInfo(reply, device, info); - if (ret == 0 && mode == BLOCK_JOB_PULL && bandwidth != 0) - ret = qemuMonitorJSONBlockJob(mon, device, bandwidth, NULL, - BLOCK_JOB_SPEED); - virJSONValueFree(cmd); virJSONValueFree(reply); return ret; -- 1.7.3

2 1

[libvirt] [PATCH] Increase size of buffer for xend response
by Jim Fehlig 02 Sep '11

02 Sep '11

On systems with many pcpus, the sexpr returned by xend can be quite large for dom0 when it is configured to have #vcpus = #pcpus (default). E.g. on a 80 pcpu system, where dom0 had 80 vcpus, the sexpr details for dom0 was 73817 bytes! Increase maximum buffer size to 256k. --- src/xen/xend_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 957cd17..1fdebe1 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -56,7 +56,7 @@ * The number of Xen scheduler parameters */ -#define XEND_RCV_BUF_MAX_LEN 65536 +#define XEND_RCV_BUF_MAX_LEN 262144 static int virDomainXMLDevID(virDomainPtr domain, -- 1.7.5.4

2 2