- Devel - libvirt List Archives

[libvirt] [PATCH v2] storage: ZFS support
by Roman Bogorodskiy 12 Aug '14

12 Aug '14

Changes from the initial version: - Update docs/schemas and docs/storage.html.in with ZFS backend information - Drop StartPool and StopPool that does nothing and therefore not needed - Fix memory leak in 'tokens' variable - Fill volume key before creating a volume - Use volume's target.path as a key - Allow not to specify 'target' for pool because in any case it should be /dev/zvol/$poolname Few notes on Linux support: I've been playing around with http://zfsonlinux.org/. I noticed it missed '-H' switch to provide a machine-friendly output and created a feature request: https://github.com/zfsonlinux/zfs/issues/2522 It was quickly fixed, so I've updated from the git version and moved on. >From that point it worked well and the only thing I had to modify is not to pass 'volmode' parameter during volume creation (it's freebsd specific and it could be e.g. just cdev or a FreeBSD geom provider). So, basically, for the current (limited) feature set the two things need to be checked on Linux: - zpool get support for -H switch - zfs volmode support for volume creation I'm open for suggestions what would be a good way to check it. For the '-H' thing, I was thinking about calling just 'zpool get -H' in StartPool. If the error says 'invalid option 'H'' (i.e. check if it just contains 'H'), then return an error that zfs version is too old. That's fragile, but probably less fragile than parsing usage that looks like that: usage: get [-pH] <"all" | property[,...]> <pool> ... As for the 'volmode', it's simple in terms of parsing, because e.g. 'zfs get' prints a nice set of parameters e.g.: volblocksize NO YES 512 to 128k, power of 2 volmode YES YES default | geom | dev | none volsize YES NO <size> So it should not be a problem to check it once and save in some sort of state struct inside of the ZFS backend. Roman Bogorodskiy (1): storage: ZFS support configure.ac | 43 +++++ docs/schemas/storagepool.rng | 20 +++ docs/storage.html.in | 34 ++++ include/libvirt/libvirt.h.in | 1 + po/POTFILES.in | 1 + src/Makefile.am | 8 + src/conf/storage_conf.c | 15 +- src/conf/storage_conf.h | 4 +- src/qemu/qemu_conf.c | 1 + src/storage/storage_backend.c | 6 + src/storage/storage_backend_zfs.c | 329 ++++++++++++++++++++++++++++++++++++++ src/storage/storage_backend_zfs.h | 29 ++++ src/storage/storage_driver.c | 1 + tools/virsh-pool.c | 3 + 14 files changed, 492 insertions(+), 3 deletions(-) create mode 100644 src/storage/storage_backend_zfs.c create mode 100644 src/storage/storage_backend_zfs.h -- 1.9.0

2 4

[libvirt] [PATCH] qemu: process: Fix header format of qemuProcessSetVcpuAffinities
by Peter Krempa 12 Aug '14

12 Aug '14

Fix header alignment and remove the unused conn parameter. --- Notes: Pushed as trivial. src/qemu/qemu_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 407da5e..9e6a9ae 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2221,8 +2221,7 @@ qemuProcessSetLinkStates(virDomainObjPtr vm) /* Set CPU affinities for vcpus if vcpupin xml provided. */ static int -qemuProcessSetVcpuAffinities(virConnectPtr conn ATTRIBUTE_UNUSED, - virDomainObjPtr vm) +qemuProcessSetVcpuAffinities(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; @@ -4243,7 +4242,7 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Setting VCPU affinities"); - if (qemuProcessSetVcpuAffinities(conn, vm) < 0) + if (qemuProcessSetVcpuAffinities(vm) < 0) goto cleanup; VIR_DEBUG("Setting affinity of emulator threads"); -- 2.0.2

1 0

[libvirt] [PATCH 1/1] qemu: min_guarantee: Parameter 'min_guarantee' not supported
by Erik Skultety 12 Aug '14

12 Aug '14

The 'min_guarantee' is used by esx and vmx drivers, with qemu however, libvirt should report error when starting a domain, because this element is not used. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1122455 --- src/qemu/qemu_process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 407da5e..22247fd 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3994,6 +3994,13 @@ int qemuProcessStart(virConnectPtr conn, flags & VIR_QEMU_PROCESS_START_COLD) < 0) goto cleanup; + if (vm->def->mem.min_guarantee) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Parameter 'min_guarantee' " + "not supported")); + goto cleanup; + } + if (VIR_ALLOC(priv->monConfig) < 0) goto cleanup; -- 1.9.3

3 2

[libvirt] [RFC][scale] new API for querying domains stats
by Francesco Romani 12 Aug '14

12 Aug '14

Hi everyone, I'd like to discuss possible APIs and plans for new query APIs in libvirt. I'm one of the oVirt (http://www.ovirt.org) developers, and I write code for VDSM; VDSM is the node management daemon, which is in charge, among many other things, to gather the host and statistics per Domain/VM. Right now we aim for a number of VM per node in the (few) hundreds, but we have big plans to scale much more, and to possibly reach thousands in a not so distant future. At the moment, we use one thread per VM to gather the VM stats (CPU, network, disk), and of course this obviously scales poorly. This is made only worse by the fact that VDSM is a python 2.7 application, and notoriously python 2.x behaves very badly with threads. We are already working to improve our code, but I'd like to bring the discussion here and see if and when the querying API can be improved. We currently use these APIs for our sempling: virDomainBlockInfo virDomainGetInfo virDomainGetCPUStats virDomainBlockStats virDomainBlockStatsFlags virDomainInterfaceStats virDomainGetVcpusFlags virDomainGetMetadata What we'd like to have is * asynchronous APIs for querying domain stats (https://bugzilla.redhat.com/show_bug.cgi?id=1113106) This would be just awesome. Either a single callback or a different one per call is fine (let's discuss this!). please note that we are much more concerned about thread reduction then about performance numbers. We had report of thread number becoming a real harm, while performance so far is not yet a concern (https://bugzilla.redhat.com/show_bug.cgi?id=1102147#c54) * bulk APIs for querying domain stats (https://bugzilla.redhat.com/show_bug.cgi?id=1113116) would be really welcome as well. It is quite independent from the previous bullet point and would help us greatly with scale. So, I'd like to discuss if these additions are (or can be) in the project roadmap, and, if so, how the API could look like and what the possible timeframe could be. Of course I'd be happy to provide any further information about VDSM and its workings. Thoughts very welcome! Thanks and best regards, -- Francesco Romani RedHat Engineering Virtualization R & D Phone: 8261328 IRC: fromani

7 31

[libvirt] [PATCHv3] numatune: Fix parsing of empty nodeset (0,^0)
by Erik Skultety 12 Aug '14

12 Aug '14

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1121837 --- src/util/virbitmap.c | 3 +++ ...emuxml2argv-numatune-memory-invalid-nodeset.xml | 31 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 35 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 27282df..b6bd074 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -378,6 +378,9 @@ virBitmapParse(const char *str, } } + if (virBitmapIsAllClear(*bitmap)) + goto error; + return virBitmapCountBits(*bitmap); error: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml new file mode 100644 index 0000000..079ca9d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <numatune> + <memory mode="strict" nodeset="0,^0"/> + </numatune> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1c121ff..62b969c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1210,6 +1210,7 @@ mymain(void) DO_TEST("cputune-zero-shares", QEMU_CAPS_NAME); DO_TEST("numatune-memory", NONE); + DO_TEST_PARSE_ERROR("numatune-memory-invalid-nodeset", NONE); DO_TEST("numatune-memnode", QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST_FAILURE("numatune-memnode", NONE); -- 1.9.3

2 1

[libvirt] Verifying libvirt release tarballs
by Richard Weinberger 12 Aug '14

12 Aug '14

Hi! How can I cryptographically verify libvirt releases? There are no signature/hash files in http://libvirt.org/sources/. All I see is that your git release tags are PGP signed. So, anyone who cares has to ignore everything in http://libvirt.org/sources/ and needs to regenerate the tarball from git. Or do I miss something? -- Thanks, //richard

2 1

[libvirt] [PATCH] Clear bandwidth settings for a shutoff domain using domiftune
by Jianwei Hu 12 Aug '14

12 Aug '14

qemu: To clear bandwidth settings for a shutoff domain by using domiftune. After applying this patch, we can use virsh domiftune command to clear inbound or/and outbound setting for a shutoff domain. for example: virsh domiftune $domain $interface 0 0 Please refer to below virsh help message: man virsh: To clear inbound or outbound settings, use --inbound or --outbound respectfully with average value of zero. --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 82a82aa..7db2e9c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9983,11 +9983,17 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, VIR_FREE(persistentNet->bandwidth->in); persistentNet->bandwidth->in = bandwidth->in; bandwidth->in = NULL; + } else { + VIR_FREE(persistentNet->bandwidth->in); + persistentNet->bandwidth->in = 0; } if (bandwidth->out) { VIR_FREE(persistentNet->bandwidth->out); persistentNet->bandwidth->out = bandwidth->out; bandwidth->out = NULL; + } else { + VIR_FREE(persistentNet->bandwidth->out); + persistentNet->bandwidth->out = 0; } } -- 1.8.3.1

3 2

[libvirt] [PATCH 1/1] qemu: Tidy up job handling during live migration
by Sam Bobroff 12 Aug '14

12 Aug '14

During a QEMU live migration several warning messages about job handling could be written to syslog on the destination host: "entering monitor without asking for a nested job is dangerous" The messages are written because the job handling during migration uses hard coded asyncJob values in several places that are incorrect. This patch passes the required asyncJob value around and prevents the warnings as well as any issues that the warnings may be referring to. Signed-off-by: Sam Bobroff <sam.bobroff(a)au1.ibm.com> --- src/qemu/qemu_domain.c | 5 +++-- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 21 ++++++++++++--------- src/qemu/qemu_migration.c | 3 ++- src/qemu/qemu_process.c | 33 ++++++++++++++++++--------------- src/qemu/qemu_process.h | 1 + 6 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4f63c88..3abbb14 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2497,7 +2497,8 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, int qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, - virDomainObjPtr vm) + virDomainObjPtr vm, + int asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; char **aliases; @@ -2505,7 +2506,7 @@ qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT)) return 0; - qemuDomainObjEnterMonitor(driver, vm); + ignore_value(qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob)); if (qemuMonitorGetDeviceAliases(priv->mon, &aliases) < 0) { qemuDomainObjExitMonitor(driver, vm); return -1; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 67972b9..8736889 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -369,7 +369,7 @@ extern virDomainXMLNamespace virQEMUDriverDomainXMLNamespace; extern virDomainDefParserConfig virQEMUDriverDomainDefParserConfig; int qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, - virDomainObjPtr vm); + virDomainObjPtr vm, int asyncJob); bool qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, virDomainDefPtr src, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 33541d3..b0439d2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1616,7 +1616,8 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, goto cleanup; } - if (qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + if (qemuProcessStart(conn, driver, vm, QEMU_ASYNC_JOB_NONE, + NULL, -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags) < 0) { virDomainAuditStart(vm, "booted", false); @@ -5446,7 +5447,8 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, } /* Set the migration source and start it up. */ - ret = qemuProcessStart(conn, driver, vm, "stdio", *fd, path, NULL, + ret = qemuProcessStart(conn, driver, vm, QEMU_ASYNC_JOB_NONE, + "stdio", *fd, path, NULL, VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, VIR_QEMU_PROCESS_START_PAUSED); @@ -6143,7 +6145,8 @@ qemuDomainObjStart(virConnectPtr conn, } } - ret = qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + ret = qemuProcessStart(conn, driver, vm, QEMU_ASYNC_JOB_NONE, + NULL, -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags); virDomainAuditStart(vm, "booted", ret >= 0); if (ret >= 0) { @@ -6500,7 +6503,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, } if (ret == 0) - qemuDomainUpdateDeviceList(driver, vm); + qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE); return ret; } @@ -6560,7 +6563,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, } if (ret == 0) - qemuDomainUpdateDeviceList(driver, vm); + qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE); return ret; } @@ -14101,8 +14104,8 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (config) virDomainObjAssignDef(vm, config, false, NULL); - rc = qemuProcessStart(snapshot->domain->conn, - driver, vm, NULL, -1, NULL, snap, + rc = qemuProcessStart(snapshot->domain->conn, driver, vm, + QEMU_ASYNC_JOB_NONE, NULL, -1, NULL, snap, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, VIR_QEMU_PROCESS_START_PAUSED); virDomainAuditStart(vm, "from-snapshot", rc >= 0); @@ -14195,8 +14198,8 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (event) qemuDomainEventQueue(driver, event); - rc = qemuProcessStart(snapshot->domain->conn, - driver, vm, NULL, -1, NULL, NULL, + rc = qemuProcessStart(snapshot->domain->conn, driver, vm, + QEMU_ASYNC_JOB_NONE, NULL, -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags); virDomainAuditStart(vm, "from-snapshot", rc >= 0); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 767d840..1c46b34 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2480,7 +2480,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ - if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], NULL, NULL, + if (qemuProcessStart(dconn, driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, + migrateFrom, dataFD[0], NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, VIR_QEMU_PROCESS_START_PAUSED | VIR_QEMU_PROCESS_START_AUTODESTROY) < 0) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8a6b384..229de6d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1444,7 +1444,8 @@ static qemuMonitorCallbacks monitorCallbacks = { }; static int -qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int logfd) +qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, + int logfd) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; @@ -1495,7 +1496,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int logfd) } - qemuDomainObjEnterMonitor(driver, vm); + ignore_value(qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob)); ret = qemuMonitorSetCapabilities(priv->mon); if (ret == 0 && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) @@ -1901,6 +1902,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, static int qemuProcessWaitForMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, + int asyncJob, virQEMUCapsPtr qemuCaps, off_t pos) { @@ -1926,7 +1928,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, } VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name); - if (qemuConnectMonitor(driver, vm, logfd) < 0) + if (qemuConnectMonitor(driver, vm, asyncJob, logfd) < 0) goto cleanup; /* Try to get the pty path mappings again via the monitor. This is much more @@ -1938,7 +1940,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, goto cleanup; priv = vm->privateData; - qemuDomainObjEnterMonitor(driver, vm); + ignore_value(qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob)); ret = qemuMonitorGetPtyPaths(priv->mon, paths); qemuDomainObjExitMonitor(driver, vm); @@ -1984,13 +1986,13 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, static int qemuProcessDetectVcpuPIDs(virQEMUDriverPtr driver, - virDomainObjPtr vm) + virDomainObjPtr vm, int asyncJob) { pid_t *cpupids = NULL; int ncpupids; qemuDomainObjPrivatePtr priv = vm->privateData; - qemuDomainObjEnterMonitor(driver, vm); + ignore_value(qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob)); /* failure to get the VCPU<-> PID mapping or to execute the query * command will not be treated fatal as some versions of qemu don't * support this command */ @@ -3150,7 +3152,7 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver, old = priv->qemuDevices; priv->qemuDevices = NULL; - if (qemuDomainUpdateDeviceList(driver, vm) < 0) + if (qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) goto cleanup; if ((tmp = old)) { @@ -3216,7 +3218,7 @@ qemuProcessReconnect(void *opaque) virObjectRef(obj); /* XXX check PID liveliness & EXE path */ - if (qemuConnectMonitor(driver, obj, -1) < 0) + if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, -1) < 0) goto error; /* Failure to connect to agent shouldn't be fatal */ @@ -3655,6 +3657,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, virDomainObjPtr vm) int qemuProcessStart(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, + int asyncJob, const char *migrateFrom, int stdin_fd, const char *stdin_path, @@ -4137,7 +4140,7 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Waiting for monitor to show up"); - if (qemuProcessWaitForMonitor(driver, vm, priv->qemuCaps, pos) < 0) + if (qemuProcessWaitForMonitor(driver, vm, asyncJob, priv->qemuCaps, pos) < 0) goto cleanup; /* Failure to connect to agent shouldn't be fatal */ @@ -4160,7 +4163,7 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Detecting VCPU PIDs"); - if (qemuProcessDetectVcpuPIDs(driver, vm) < 0) + if (qemuProcessDetectVcpuPIDs(driver, vm, asyncJob) < 0) goto cleanup; VIR_DEBUG("Setting cgroup for each VCPU (if required)"); @@ -4195,7 +4198,7 @@ int qemuProcessStart(virConnectPtr conn, /* qemu doesn't support setting this on the command line, so * enter the monitor */ VIR_DEBUG("Setting network link states"); - qemuDomainObjEnterMonitor(driver, vm); + ignore_value(qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob)); if (qemuProcessSetLinkStates(vm) < 0) { qemuDomainObjExitMonitor(driver, vm); goto cleanup; @@ -4204,7 +4207,7 @@ int qemuProcessStart(virConnectPtr conn, qemuDomainObjExitMonitor(driver, vm); VIR_DEBUG("Fetching list of active devices"); - if (qemuDomainUpdateDeviceList(driver, vm) < 0) + if (qemuDomainUpdateDeviceList(driver, vm, asyncJob) < 0) goto cleanup; /* Technically, qemuProcessStart can be called from inside @@ -4219,7 +4222,7 @@ int qemuProcessStart(virConnectPtr conn, vm->def->mem.cur_balloon); goto cleanup; } - qemuDomainObjEnterMonitor(driver, vm); + ignore_value(qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob)); if (vm->def->memballoon && vm->def->memballoon->period) qemuMonitorSetMemoryStatsPeriod(priv->mon, vm->def->memballoon->period); if (qemuMonitorSetBalloon(priv->mon, cur_balloon) < 0) { @@ -4764,7 +4767,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, vm->pid = pid; VIR_DEBUG("Waiting for monitor to show up"); - if (qemuProcessWaitForMonitor(driver, vm, priv->qemuCaps, -1) < 0) + if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, priv->qemuCaps, -1) < 0) goto error; /* Failure to connect to agent shouldn't be fatal */ @@ -4779,7 +4782,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, } VIR_DEBUG("Detecting VCPU PIDs"); - if (qemuProcessDetectVcpuPIDs(driver, vm) < 0) + if (qemuProcessDetectVcpuPIDs(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) goto error; /* If we have -device, then addresses are assigned explicitly. diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 9c78736..5948ea4 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -53,6 +53,7 @@ typedef enum { int qemuProcessStart(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, + int asyncJob, const char *migrateFrom, int stdin_fd, const char *stdin_path, -- 2.0.2.731.g247b4d5

2 4

[libvirt] [PATCH] docs: use unique dev names in <disk> examples
by Eric Blake 12 Aug '14

12 Aug '14

Jiri Moskovcak reported on IRC that the documentation on valid <disk> was confusing because it didn't have unique dev='...' entries. * docs/formatdomain.html.in: Use unique names. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/formatdomain.html.in | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8950959..08f31c4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1540,14 +1540,14 @@ <source protocol="rbd" name="image_name2"> <host name="hostname" port="7000"/> </source> - <target dev="hdd" bus="ide"/> + <target dev="hdc" bus="ide"/> <auth username='myuser'> <secret type='ceph' usage='mypassid'/> </auth> </disk> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdd' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1555,7 +1555,7 @@ <source protocol="http" name="url_path"> <host name="hostname" port="80"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hde' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1563,7 +1563,7 @@ <source protocol="https" name="url_path"> <host name="hostname" port="443"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdf' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1571,7 +1571,7 @@ <source protocol="ftp" name="url_path"> <host name="hostname" port="21"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdg' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1579,7 +1579,7 @@ <source protocol="ftps" name="url_path"> <host name="hostname" port="990"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdh' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1587,7 +1587,7 @@ <source protocol="tftp" name="url_path"> <host name="hostname" port="69"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdi' bus='ide' tray='open'/> <readonly/> </disk> <disk type='block' device='lun'> @@ -1601,12 +1601,12 @@ <source dev='/dev/sda'/> <geometry cyls='16383' heads='16' secs='63' trans='lba'/> <blockio logical_block_size='512' physical_block_size='4096'/> - <target dev='hda' bus='ide'/> + <target dev='sdb' bus='ide'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='blk-pool0' volume='blk-pool0-vol0'/> - <target dev='hda' bus='ide'/> + <target dev='sdc' bus='ide'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> @@ -1626,7 +1626,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='sda' bus='scsi'/> + <target dev='vdb' bus='scsi'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> @@ -1634,7 +1634,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='vda' bus='virtio'/> + <target dev='vdc' bus='virtio'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> @@ -1642,7 +1642,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='vda' bus='virtio'/> + <target dev='vdd' bus='virtio'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> @@ -1656,7 +1656,7 @@ <backingStore/> </backingStore> </backingStore> - <target dev='vda' bus='virtio'/> + <target dev='vde' bus='virtio'/> </disk> </devices> ...</pre> -- 1.7.1

3 4

[libvirt] [PATCH] qemu: use guest-fsfreeze-freeze-list command if mountpoints to freeze specified
by Tomoki Sekiyama 11 Aug '14

11 Aug '14

A command to freeze a part of mounted file systems is implemented in upstream QEMU-guest-agent with a name of 'guest-fsfreeze-freeze-list'. This fixes the name of the command used to partial fsfreeze in qemu driver when 'mountpoints' option is specified to virDomainFSFreeze API. Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> --- src/qemu/qemu_agent.c | 2 +- tests/qemuagenttest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0421733..a10954a 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1336,7 +1336,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon, const char **mountpoints, if (!arg) return -1; - cmd = qemuAgentMakeCommand("guest-fsfreeze-freeze", + cmd = qemuAgentMakeCommand("guest-fsfreeze-freeze-list", "a:mountpoints", arg, NULL); } else { cmd = qemuAgentMakeCommand("guest-fsfreeze-freeze", NULL); diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index be207e8..bc649b4 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -45,7 +45,7 @@ testQemuAgentFSFreeze(const void *data) if (qemuMonitorTestAddAgentSyncResponse(test) < 0) goto cleanup; - if (qemuMonitorTestAddItem(test, "guest-fsfreeze-freeze", + if (qemuMonitorTestAddItem(test, "guest-fsfreeze-freeze-list", "{ \"return\" : 5 }") < 0) goto cleanup;

3 4

[libvirt] [PATCH v2] Include param.h in case of HAVE_BSD_CPU_AFFINITY
by Guido Günther 11 Aug '14

11 Aug '14

This fixes compilation on kFreeBSD which otherwise fails like CC util/libvirt_util_la-virprocess.lo In file included from /usr/include/sys/cpuset.h:35:0, from util/virprocess.c:43: /usr/include/sys/_cpuset.h:49:43: error: 'NBBY' undeclared here (not in a function) long __bits[howmany(CPU_SETSIZE, _NCPUBITS)]; ^ In file included from util/virprocess.c:43:0: /usr/include/sys/cpuset.h:215:12: error: unknown type name 'cpusetid_t' int cpuset(cpusetid_t *); ^ /usr/include/sys/cpuset.h:216:30: error: expected ')' before 'id_t' int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); ^ /usr/include/sys/cpuset.h:217:42: error: expected ')' before 'id_t' int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); ^ /usr/include/sys/cpuset.h:218:48: error: expected ')' before 'id_t' int cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, cpuset_t *); ^ /usr/include/sys/cpuset.h:219:48: error: expected ')' before 'id_t' int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, const cpuset_t *); And it's the correct usage as documented in http://www.freebsd.org/cgi/man.cgi?query=cpuset_setid Also change the #ifdef HAVE_BSH_CPU_AFFINITY to #if for consistency. --- The previous version inluded sys/param.h twice causing make syntax-check to fail. -- Guido src/util/virprocess.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 9179d73..97cce4f 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -33,13 +33,16 @@ #endif #include <sched.h> -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || HAVE_BSD_CPU_AFFINITY # include <sys/param.h> +#endif + +#ifdef __FreeBSD__ # include <sys/sysctl.h> # include <sys/user.h> #endif -#ifdef HAVE_BSD_CPU_AFFINITY +#if HAVE_BSD_CPU_AFFINITY # include <sys/cpuset.h> #endif -- 2.0.1

2 2

[libvirt] [PATCH] Don't fail qemu driver intialization if we can't determine hugepage size
by Guido Günther 11 Aug '14

11 Aug '14

Otherwise we fail like libvirt version: 1.2.7, package: 6 (root 2014-08-08-16:09:22 bogon) virAuditOpen:62 : Unable to initialize audit layer: Protocol not supported virFileGetDefaultHugepageSize:2958 : internal error: Unable to parse /proc/meminfo virStateInitialize:749 : Initialization of QEMU state driver failed: internal error: Unable to parse /proc/meminfo daemonRunStateInit:922 : Driver state initialization failed if the data can't be determined. Reference: http://bugs.debian.org/757609 --- src/util/virfile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index f9efc65..b6f5e3f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2953,8 +2953,9 @@ virFileGetDefaultHugepageSize(unsigned long long *size) goto cleanup; if (!(c = strstr(meminfo, HUGEPAGESIZE_STR))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse %s"), + virReportError(VIR_ERR_NO_SUPPORT, + _("%s not found in %s"), + HUGEPAGESIZE_STR, PROC_MEMINFO); goto cleanup; } -- 2.0.1

2 3

[libvirt] [PATCH] Make 'uri' command a bit more prominent.
by Guido Günther 11 Aug '14

11 Aug '14

This tries to address https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688778 were libvirt autodetected vbox:///session and it wasn't listed in the manpage. --- tools/virsh.pod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 26b1d79..afaca5b 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -272,6 +272,8 @@ connect to a local linux container =back +To find the currently used uri check the I<uri> command below. + For remote access see the documentation page at L<http://libvirt.org/uri.html> on how to make URIs. The I<--readonly> option allows for read-only connection -- 2.0.1

2 2

[libvirt] [PATCH 0/2] Fix interface pool problems
by Laine Stump 11 Aug '14

11 Aug '14

Each of these has an associated bugzilla record; 1/2 against RHEL6 and 2/2 against RHEL7, but both bugs exist in all versions of libvirt that support the <pf dev='xyz'/> element. 1/2 is more serious as it can lead to a crash, while 2/2 just changes the timing of error reporting.the discovery of bad configurations. Laine Stump (2): network: make networkCreateInterfacePool more robust network: populate interface pool immediately when network is started src/network/bridge_driver.c | 179 ++++++++++++++++++++++++++------------------ 1 file changed, 107 insertions(+), 72 deletions(-) -- 1.9.3

2 4

[libvirt] [python-PATCH] Fix libvirt_longlongWrap returning a very large value
by Wang Rui 11 Aug '14

11 Aug '14

From: Zhou Yimin <zhouyimin(a)huawei.com> If hypervisor is not Xen, the errs in struct _virDomainBlockStats will be -1. But in KVM when we call domain.blockStats(), errs is 18446744073709551615. To fix that, this patch has two changes: 1. Replace use of the PyLong_FromUnsignedLongLong with PyLong_FromLongLong in function libvirt_longlongWrap 2. If the paramemter of libvirt_longlongWrap is unsigned long long, use libvirt_ulonglongWrap instead because of above change. After this patch, errs is -1 which is consistent with virDomainBlockStats api. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- libvirt-override.c | 18 +++++++++--------- typewrappers.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index ed5e9e4..b2271ae 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -1625,7 +1625,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyTuple_SetItem(info, 1, item) < 0) goto itemError; - if ((item = libvirt_longlongWrap((long long)cpuinfo[i].cpuTime)) == NULL || + if ((item = libvirt_ulonglongWrap(cpuinfo[i].cpuTime)) == NULL || PyTuple_SetItem(info, 2, item) < 0) goto itemError; @@ -2794,7 +2794,7 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyList_SetItem(py_retval, 2, libvirt_ulongWrap(info.memory)); PyList_SetItem(py_retval, 3, libvirt_intWrap((int) info.nrVirtCpu)); PyList_SetItem(py_retval, 4, - libvirt_longlongWrap((unsigned long long) info.cpuTime)); + libvirt_ulonglongWrap(info.cpuTime)); return py_retval; } @@ -2849,7 +2849,7 @@ libvirt_virDomainGetControlInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) py_retval = PyList_New(3); PyList_SetItem(py_retval, 0, libvirt_intWrap(info.state)); PyList_SetItem(py_retval, 1, libvirt_intWrap(info.details)); - PyList_SetItem(py_retval, 2, libvirt_longlongWrap(info.stateTime)); + PyList_SetItem(py_retval, 2, libvirt_ulonglongWrap(info.stateTime)); return py_retval; } @@ -3354,7 +3354,7 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg py_retval = PyList_New(c_retval); for (i = 0; i < c_retval; i++) { PyList_SetItem(py_retval, i, - libvirt_longlongWrap((long long) freeMems[i])); + libvirt_ulonglongWrap(freeMems[i])); } VIR_FREE(freeMems); return py_retval; @@ -3794,11 +3794,11 @@ libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.state)); PyList_SetItem(py_retval, 1, - libvirt_longlongWrap((unsigned long long) info.capacity)); + libvirt_ulonglongWrap(info.capacity)); PyList_SetItem(py_retval, 2, - libvirt_longlongWrap((unsigned long long) info.allocation)); + libvirt_ulonglongWrap(info.allocation)); PyList_SetItem(py_retval, 3, - libvirt_longlongWrap((unsigned long long) info.available)); + libvirt_ulonglongWrap(info.available)); return py_retval; } @@ -3825,9 +3825,9 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return VIR_PY_NONE; PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.type)); PyList_SetItem(py_retval, 1, - libvirt_longlongWrap((unsigned long long) info.capacity)); + libvirt_ulonglongWrap(info.capacity)); PyList_SetItem(py_retval, 2, - libvirt_longlongWrap((unsigned long long) info.allocation)); + libvirt_ulonglongWrap(info.allocation)); return py_retval; } diff --git a/typewrappers.c b/typewrappers.c index a5b562d..5399fb7 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -79,7 +79,7 @@ PyObject * libvirt_longlongWrap(long long val) { PyObject *ret; - ret = PyLong_FromUnsignedLongLong((unsigned long long) val); + ret = PyLong_FromLongLong(val); return ret; } -- 1.7.12.4

2 1

[libvirt] [PATCH 0/4] Wrong allocation size displayed for NFS volumes
by John Ferlan 11 Aug '14

11 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1077068 The virsh vol-info (and virsh domblkinfo) commands return an incorrect size if the target device is an NFS volume. These patches will add a check for the target being NFS and rather than calculate the size based on "st_blocks" and "DEV_BSIZE" (512) use the "st_size" value instead. John Ferlan (4): virfile: Split virFileGetFSFtype virfile: Introduce virFileIsNFSFSType vol-info: Check for NFS FS type domblkinfo: Check for NFS FS Type src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 7 ++++-- src/storage/storage_backend.c | 7 ++++-- src/util/virfile.c | 53 +++++++++++++++++++++++++++++++++++-------- src/util/virfile.h | 1 + 5 files changed, 55 insertions(+), 14 deletions(-) -- 1.9.3

2 12

[libvirt] [PATCHv2] numatune: Fix parsing of empty nodeset (0,^0)
by Erik Skultety 11 Aug '14

11 Aug '14

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1121837 --- Notes: Version 2: - reject empty bitmaps while parsing instead of just rejecting nodesets src/util/virbitmap.c | 3 +++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 4 insertions(+) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 27282df..b6bd074 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -378,6 +378,9 @@ virBitmapParse(const char *str, } } + if (virBitmapIsAllClear(*bitmap)) + goto error; + return virBitmapCountBits(*bitmap); error: diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1c121ff..62b969c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1210,6 +1210,7 @@ mymain(void) DO_TEST("cputune-zero-shares", QEMU_CAPS_NAME); DO_TEST("numatune-memory", NONE); + DO_TEST_PARSE_ERROR("numatune-memory-invalid-nodeset", NONE); DO_TEST("numatune-memnode", QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST_FAILURE("numatune-memnode", NONE); -- 1.9.3

1 0

[libvirt] [PATCH] conf: Format interface's driver more frequently
by Michal Privoznik 11 Aug '14

11 Aug '14

There's this <driver/> element under <interface/> which can have several attributes. However, the driver element is currently formated only if the driver's name or txmode has been specified. This makes only a little sense as we parse even partial <driver/>, for instance: <interface type='user'> <mac address='52:54:00:e5:48:58'/> <model type='virtio'/> <driver ioeventfd='on' event_idx='on' queues='5'/> </interface> But such XML would never get formatted back. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 4 +- .../qemuxml2argv-interface-driver.xml | 51 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c7016f3..934f6cb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16286,7 +16286,9 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<model type='%s'/>\n", def->model); if (STREQ(def->model, "virtio") && - (def->driver.virtio.name || def->driver.virtio.txmode)) { + (def->driver.virtio.name || def->driver.virtio.txmode || + def->driver.virtio.ioeventfd || def->driver.virtio.event_idx || + def->driver.virtio.queues)) { virBufferAddLit(buf, "<driver"); if (def->driver.virtio.name) { virBufferAsprintf(buf, " name='%s'", diff --git a/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml b/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml new file mode 100644 index 0000000..ec5ab61 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml @@ -0,0 +1,51 @@ +<domain type='qemu'> + <name>test</name> + <uuid>15d091de-0181-456b-9554-e4382dc1f1ab</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.13'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' event_idx='on'/> + <source file='/var/lib/libvirt/images/f14.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='user'> + <mac address='52:54:00:e5:48:58'/> + <model type='virtio'/> + <driver ioeventfd='on' event_idx='on' queues='5'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7d416d0..5941323 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -299,6 +299,7 @@ mymain(void) DO_TEST("lease"); DO_TEST("event_idx"); DO_TEST("vhost_queues"); + DO_TEST("interface-driver"); DO_TEST("virtio-lun"); DO_TEST("usb-redir"); -- 1.8.5.5

2 1

[libvirt] [PATCH 1/1] numatune: Fix parsing of empty nodeset (0, ^0)
by Erik Skultety 11 Aug '14

11 Aug '14

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1121837 --- src/conf/numatune_conf.c | 18 +++++++++++-- ...emuxml2argv-numatune-memory-invalid-nodeset.xml | 31 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml diff --git a/src/conf/numatune_conf.c b/src/conf/numatune_conf.c index 48d1d04..9d7959a 100644 --- a/src/conf/numatune_conf.c +++ b/src/conf/numatune_conf.c @@ -182,6 +182,12 @@ virDomainNumatuneNodeParseXML(virDomainNumatunePtr *numatunePtr, if (virBitmapParse(tmp, 0, &mem_node->nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) goto cleanup; + + if (virBitmapIsAllClear(mem_node->nodeset)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Numatune memory nodeset is empty")); + goto cleanup; + } VIR_FREE(tmp); } @@ -264,8 +270,16 @@ virDomainNumatuneParseXML(virDomainNumatunePtr *numatunePtr, VIR_FREE(tmp); tmp = virXMLPropString(node, "nodeset"); - if (tmp && virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; + if (tmp) { + if (virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + + if (virBitmapIsAllClear(nodeset)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Numatune memory nodeset is empty")); + goto cleanup; + } + } VIR_FREE(tmp); if (virDomainNumatuneSet(numatunePtr, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml new file mode 100644 index 0000000..d2b41b4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <numatune> + <memory mode="strict" nodeset="0,^0"/> + </numatune> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1c121ff..62b969c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1210,6 +1210,7 @@ mymain(void) DO_TEST("cputune-zero-shares", QEMU_CAPS_NAME); DO_TEST("numatune-memory", NONE); + DO_TEST_PARSE_ERROR("numatune-memory-invalid-nodeset", NONE); DO_TEST("numatune-memnode", QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST_FAILURE("numatune-memnode", NONE); -- 1.9.3

2 1

[libvirt] [PATCH libvirt 0/6] Add support for qemu usb-mtp device
by Giuseppe Scrivano 11 Aug '14

11 Aug '14

This series adds support for qemu usb-mtp devices. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1121781 Giuseppe Scrivano (6): conf: add MTP filesystem support to the parser conf, virDomainFSDefPtr: rename "path" argument to "target" qemu_command: fix block indentation qemu: add support for MTP filesystem docs: add documentation and schema for MTP filesystem type tests: add tests for MTP filesystem docs/formatdomain.html.in | 9 +++++ docs/schemas/domaincommon.rng | 15 ++++++-- src/conf/domain_conf.c | 38 +++++++++++++------ src/conf/domain_conf.h | 3 +- src/qemu/qemu_command.c | 67 +++++++++++++++++++--------------- tests/domainconfdata/getfilesystem.xml | 4 ++ tests/domainconftest.c | 2 + 7 files changed, 93 insertions(+), 45 deletions(-) -- 1.9.3

2 11

[libvirt] [PATCH v1 0/3] OVMF exposure
by Michal Privoznik 11 Aug '14

11 Aug '14

Not so long ago, QEMU introduced support for UEFI instead of standard BIOS. Our domain XML needs to be adjusted, however. Users are expected to use mainly OVMF which works in two modes: 1) UEFI code and UEFI variables are mixed in one file 2) The code and variables are split in two separate files For the case number one we are almost ready. The second case, however, needs more changes on our side. Especially if you consider fact, that the UEFI code can be shared among multiple domains while the variables store can't. Michal Privoznik (3): conf: Extend <loader/> and introduce <nvram/> qemu: Implement extended loader and nvram qemu: Automatically create NVRAM store configure.ac | 27 +++++ docs/formatdomain.html.in | 19 +++- docs/schemas/domaincommon.rng | 21 ++++ libvirt.spec.in | 2 + src/Makefile.am | 1 + src/conf/domain_conf.c | 87 +++++++++++++- src/conf/domain_conf.h | 22 +++- src/libvirt_private.syms | 3 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 9 ++ src/qemu/qemu_command.c | 87 +++++++++++++- src/qemu/qemu_conf.c | 8 ++ src/qemu/qemu_conf.h | 3 + src/qemu/qemu_process.c | 125 +++++++++++++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/security_dac.c | 8 ++ src/security/security_selinux.c | 8 ++ src/security/virt-aa-helper.c | 4 +- src/vbox/vbox_tmpl.c | 7 +- src/xenapi/xenapi_driver.c | 3 +- src/xenxs/xen_sxpr.c | 16 +-- src/xenxs/xen_xm.c | 8 +- .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 10 ++ tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml | 40 +++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 +- tests/qemuxml2xmltest.c | 2 + tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- 82 files changed, 556 insertions(+), 82 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml -- 1.8.5.5

3 9

[libvirt] Lifecycle events during reboot for KVM and Xen
by Thomas Bechtold 11 Aug '14

11 Aug '14

Hi, during debugging a problem[1] of Openstack Nova I recognized the following: Doing a reboot (from inside of the VM with "reboot" command) on a kvm VM doesn't send any lifecycle events (events debugged with [2]). Doing the same thing with a xen VM leads to 2 events: First a VIR_DOMAIN_EVENT_STOPPED and then a VIR_DOMAIN_EVENT_STARTED event. The problem here is that for the xen case it doesn't seem to be possible to recognize that a reboot is ongoing. For that reason the OpenStack Nova component just forces the domain to stop after receiving the VIR_DOMAIN_EVENT_STOPPED event. Is it expected that the 2 drivers send different events for the same action or a bug in qemu/xen/libvirt? Cheers, Tom [1] https://bugs.launchpad.net/nova/+bug/1293480 [2] https://gist.github.com/toabctl/53f26989ad7634a3168b

3 4

[libvirt] qemu driver fails to load on Xen after be0782e1
by Jim Fehlig 11 Aug '14

11 Aug '14

Until recently, the qemu driver has always succeeded in loading even on a system booted to Xen. Commit be0782e1 broke this, hence libvirtd no longer loads xendom0 # /usr/sbin/libvirtd -l 2014-08-04 22:27:31.586+0000: 35859: info : libvirt version: 1.2.8 2014-08-04 22:27:31.586+0000: 35859: error : virFileGetDefaultHugepageSize:2958 : internal error: Unable to parse /proc/meminfo 2014-08-04 22:27:31.586+0000: 35859: error : virStateInitialize:749 : Initialization of QEMU state driver failed: internal error: Unable to parse /proc/meminfo 2014-08-04 22:27:31.586+0000: 35859: error : daemonRunStateInit:922 : Driver state initialization failed Problem is the Xen kernel does not provide any huge page info in /proc/meminfo xendom0 # cat /proc/meminfo | grep -i huge xendom0 # Michal, short of always building with '--without-qemu' on a Xen system, is it possible to make detection of huge pages less fatal wrt loading the qemu driver? Regards, Jim

3 3

[libvirt] [PATCH] Include param.h in case of HAVE_BSD_CPU_AFFINITY
by Guido Günther 11 Aug '14

11 Aug '14

This fixes compilation on kFreeBSD which otherwise fails like CC util/libvirt_util_la-virprocess.lo In file included from /usr/include/sys/cpuset.h:35:0, from util/virprocess.c:43: /usr/include/sys/_cpuset.h:49:43: error: 'NBBY' undeclared here (not in a function) long __bits[howmany(CPU_SETSIZE, _NCPUBITS)]; ^ In file included from util/virprocess.c:43:0: /usr/include/sys/cpuset.h:215:12: error: unknown type name 'cpusetid_t' int cpuset(cpusetid_t *); ^ /usr/include/sys/cpuset.h:216:30: error: expected ')' before 'id_t' int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); ^ /usr/include/sys/cpuset.h:217:42: error: expected ')' before 'id_t' int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); ^ /usr/include/sys/cpuset.h:218:48: error: expected ')' before 'id_t' int cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, cpuset_t *); ^ /usr/include/sys/cpuset.h:219:48: error: expected ')' before 'id_t' int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, const cpuset_t *); And it's the correct usage as documented in http://www.freebsd.org/cgi/man.cgi?query=cpuset_setid --- src/util/virprocess.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 9179d73..4d6c50d 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -40,6 +40,7 @@ #endif #ifdef HAVE_BSD_CPU_AFFINITY +# include <sys/param.h> # include <sys/cpuset.h> #endif -- 2.0.1

2 1

[libvirt] [PATCH 01/24] src/xenxs: Refactor code parsing memory config
by Kiarie Kahurani 09 Aug '14

09 Aug '14

introduce function xenParseXMMem(virConfPtr conf,.........); which parses memory config instead signed-off-by: Kiarie Kahurani <davidkiarie4(a)gmail.com> Signed-off-by: Kiarie Kahurani <davidkiarie4(a)gmail.com> --- src/xenxs/xen_xm.c | 83 +++++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 4461654..443e6da 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -40,11 +40,9 @@ #include "virstoragefile.h" #include "virstring.h" -/* Convenience method to grab a long int from the config file object */ -static int xenXMConfigGetBool(virConfPtr conf, - const char *name, - int *value, - int def) +/* Convenience method to grab a int from the config file object */ +static int +xenXMConfigGetBool(virConfPtr conf, const char *name, int *value, int def) { virConfValuePtr val; @@ -67,11 +65,10 @@ static int xenXMConfigGetBool(virConfPtr conf, } -/* Convenience method to grab a int from the config file object */ -static int xenXMConfigGetULong(virConfPtr conf, - const char *name, - unsigned long *value, - unsigned long def) +/* Convenience method to grab a long int from the config file object */ +static int +xenXMConfigGetULong(virConfPtr conf, const char *name, unsigned long *value, + unsigned long def) { virConfValuePtr val; @@ -99,10 +96,9 @@ static int xenXMConfigGetULong(virConfPtr conf, /* Convenience method to grab a int from the config file object */ -static int xenXMConfigGetULongLong(virConfPtr conf, - const char *name, - unsigned long long *value, - unsigned long long def) +static int +xenXMConfigGetULongLong(virConfPtr conf, const char *name, + unsigned long long *value, unsigned long long def) { virConfValuePtr val; @@ -130,10 +126,9 @@ static int xenXMConfigGetULongLong(virConfPtr conf, /* Convenience method to grab a string from the config file object */ -static int xenXMConfigGetString(virConfPtr conf, - const char *name, - const char **value, - const char *def) +static int +xenXMConfigGetString(virConfPtr conf, const char *name, const char **value, + const char *def) { virConfValuePtr val; @@ -155,10 +150,10 @@ static int xenXMConfigGetString(virConfPtr conf, return 0; } -static int xenXMConfigCopyStringInternal(virConfPtr conf, - const char *name, - char **value, - int allowMissing) + +static int +xenXMConfigCopyStringInternal(virConfPtr conf, const char *name, char **value, + int allowMissing) { virConfValuePtr val; @@ -188,15 +183,16 @@ static int xenXMConfigCopyStringInternal(virConfPtr conf, } -static int xenXMConfigCopyString(virConfPtr conf, - const char *name, - char **value) { +static int +xenXMConfigCopyString(virConfPtr conf, const char *name, char **value) +{ return xenXMConfigCopyStringInternal(conf, name, value, 0); } -static int xenXMConfigCopyStringOpt(virConfPtr conf, - const char *name, - char **value) { + +static int +xenXMConfigCopyStringOpt(virConfPtr conf, const char *name, char **value) +{ return xenXMConfigCopyStringInternal(conf, name, value, 1); } @@ -244,6 +240,25 @@ xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) return 0; } + +static int +xenParseXMMem(virConfPtr conf, virDomainDefPtr def) +{ + if (xenXMConfigGetULongLong(conf, "memory", &def->mem.cur_balloon, + MIN_XEN_GUEST_SIZE * 2) < 0) + return -1; + + if (xenXMConfigGetULongLong(conf, "maxmem", &def->mem.max_balloon, + def->mem.cur_balloon) < 0) + return -1; + + def->mem.cur_balloon *= 1024; + def->mem.max_balloon *= 1024; + + return 0; +} + + #define MAX_VFB 1024 /* * Turn a config record into a lump of XML describing the @@ -251,7 +266,7 @@ xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) */ virDomainDefPtr xenParseXM(virConfPtr conf, int xendConfigVersion, - virCapsPtr caps) + virCapsPtr caps) { const char *str; int hvm = 0; @@ -360,17 +375,9 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } } - if (xenXMConfigGetULongLong(conf, "memory", &def->mem.cur_balloon, - MIN_XEN_GUEST_SIZE * 2) < 0) - goto cleanup; - - if (xenXMConfigGetULongLong(conf, "maxmem", &def->mem.max_balloon, - def->mem.cur_balloon) < 0) + if (xenParseXMMem(conf, def) < 0) goto cleanup; - def->mem.cur_balloon *= 1024; - def->mem.max_balloon *= 1024; - if (xenXMConfigGetULong(conf, "vcpus", &count, 1) < 0 || MAX_VIRT_CPUS < count) goto cleanup; -- 1.8.4.5

4 37