- Devel - libvirt List Archives

[libvirt] [PATCH] Show also short-ids when calling --list-{os, platform}
by Fabiano Fidêncio 24 Oct '14

24 Oct '14

As the short-id can be used to set the os/platform in the example program, let's expose them to the user. --- examples/virt-designer.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/virt-designer.c b/examples/virt-designer.c index 7628449..12faf04 100644 --- a/examples/virt-designer.c +++ b/examples/virt-designer.c @@ -107,8 +107,8 @@ print_oses(const gchar *option_name, if (!db && !load_osinfo()) goto cleanup; - printf(" Operating System ID\n" - "-----------------------\n"); + printf(" Operating System ID (short ID)\n" + "--------------------------------\n"); list = osinfo_db_get_os_list(db); if (!list) @@ -119,6 +119,8 @@ print_oses(const gchar *option_name, OsinfoOs *os = OSINFO_OS(os_iter->data); const char *id = osinfo_entity_get_param_value(OSINFO_ENTITY(os), OSINFO_ENTITY_PROP_ID); + const char *short_id = osinfo_entity_get_param_value(OSINFO_ENTITY(os), + OSINFO_PRODUCT_PROP_SHORT_ID); printf("%s\n", id); } @@ -148,8 +150,8 @@ print_platforms(const gchar *option_name, if (!db && !load_osinfo()) goto cleanup; - printf(" Platform ID\n" - "---------------\n"); + printf(" Platform ID (short ID)\n" + "------------------------\n"); list = osinfo_db_get_platform_list(db); if (!list) @@ -160,6 +162,8 @@ print_platforms(const gchar *option_name, OsinfoPlatform *platform = OSINFO_PLATFORM(platform_iter->data); const char *id = osinfo_entity_get_param_value(OSINFO_ENTITY(platform), OSINFO_ENTITY_PROP_ID); + const char *short_id = osinfo_entity_get_param_value(OSINFO_ENTITY(platform), + OSINFO_PRODUCT_PROP_SHORT_ID); printf("%s\n", id); } @@ -577,9 +581,9 @@ main(int argc, char *argv[]) {"connect", 'c', 0, G_OPTION_ARG_STRING, &connect_uri, "libvirt connection URI used for querying capabilities", "URI"}, {"list-os", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, print_oses, - "list IDs of known OSes", NULL}, + "list IDs and short IDs of known OSes", NULL}, {"list-platform", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, print_platforms, - "list IDs of known hypervisors", NULL}, + "list IDs and short IDs of known hypervisors", NULL}, {"os", 'o', 0, G_OPTION_ARG_STRING, &os_str, "set domain OS", "OS"}, {"platform", 'p', 0, G_OPTION_ARG_STRING, &platform_str, -- 2.1.0

4 4

[libvirt] [PATCH 00/12] Split up large driver files
by Daniel P. Berrange 23 Oct '14

23 Oct '14

This patch series splits up the src/driver.h and src/libvirt.c files into a number of smaller pieces. The driver.h file gets split based on the the driver type, while libvirt.c gets split slightly different based on the object type. The reason for the difference is that the hypervisor driver is rather large, so its useful to split the domain, domain snapshot and connect/node APIs into separate files. There will be much more to follow this series. Just posting this start now since it will be painful to rebase.... Daniel P. Berrange (12): Rename virDriver to virHypervisorDriver Split driver.h into multiple parts Move virDomainSnapshot related APIs out of libvirt.c Move virNetwork related APIs out of libvirt.c Move virInterface related APIs out of libvirt.c Move virNWFilter related APIs out of libvirt.c Move virNodeDevice related APIs out of libvirt.c Move virSecret related APIs out of libvirt.c Move virStream related APIs out of libvirt.c Move virStorage{Pool,Vol} related APIs out of libvirt.c Move virDomain related APIs out of libvirt.c Move virConnect/virNode related APIs out of libvirt.c cfg.mk | 4 +- docs/apibuild.py | 11 + docs/hvsupport.pl | 2 +- po/POTFILES.in | 8 + src/Makefile.am | 20 + src/bhyve/bhyve_driver.c | 4 +- src/datatypes.h | 3 +- src/driver-hypervisor.h | 1396 +++ src/driver-interface.h | 131 + src/driver-network.h | 166 + src/driver-nodedev.h | 112 + src/driver-nwfilter.h | 94 + src/driver-secret.h | 114 + src/driver-state.h | 58 + src/driver-storage.h | 265 + src/driver-stream.h | 72 + src/driver.h | 2172 +--- src/esx/esx_driver.c | 4 +- src/hyperv/hyperv_driver.c | 4 +- src/libvirt-domain-snapshot.c | 1222 +++ src/libvirt-domain.c | 11112 ++++++++++++++++++++ src/libvirt-host.c | 1515 +++ src/libvirt-interface.c | 835 ++ src/libvirt-network.c | 1251 +++ src/libvirt-nodedev.c | 756 ++ src/libvirt-nwfilter.c | 515 + src/libvirt-secret.c | 695 ++ src/libvirt-storage.c | 2118 ++++ src/libvirt-stream.c | 704 ++ src/libvirt.c | 20537 +------------------------------------ src/libvirt_internal.h | 6 + src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 4 +- src/openvz/openvz_driver.c | 4 +- src/parallels/parallels_driver.c | 4 +- src/phyp/phyp_driver.c | 4 +- src/qemu/qemu_driver.c | 4 +- src/remote/remote_driver.c | 7 +- src/test/test_driver.c | 4 +- src/uml/uml_driver.c | 4 +- src/vbox/vbox_common.c | 4 +- src/vbox/vbox_driver.c | 14 +- src/vbox/vbox_get_driver.h | 2 +- src/vbox/vbox_tmpl.c | 4 +- src/vbox/vbox_uniformed_api.h | 2 +- src/vmware/vmware_driver.c | 4 +- src/xen/xen_driver.c | 4 +- src/xenapi/xenapi_driver.c | 4 +- 49 files changed, 23289 insertions(+), 22696 deletions(-) create mode 100644 src/driver-hypervisor.h create mode 100644 src/driver-interface.h create mode 100644 src/driver-network.h create mode 100644 src/driver-nodedev.h create mode 100644 src/driver-nwfilter.h create mode 100644 src/driver-secret.h create mode 100644 src/driver-state.h create mode 100644 src/driver-storage.h create mode 100644 src/driver-stream.h create mode 100644 src/libvirt-domain-snapshot.c create mode 100644 src/libvirt-domain.c create mode 100644 src/libvirt-host.c create mode 100644 src/libvirt-interface.c create mode 100644 src/libvirt-network.c create mode 100644 src/libvirt-nodedev.c create mode 100644 src/libvirt-nwfilter.c create mode 100644 src/libvirt-secret.c create mode 100644 src/libvirt-storage.c create mode 100644 src/libvirt-stream.c -- 2.1.0

2 28

[libvirt] [PATCH] Fix indentation of sysinfo data
by Daniel P. Berrange 23 Oct '14

23 Oct '14

The <sysinfo> data block was indented by 2 spaces too many. This was missed because we never had any test validating the XML formatting. --- src/conf/domain_conf.c | 13 +------------ tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml | 16 ++++++++++------ tests/qemuxml2xmltest.c | 1 + 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 73c199e..39befb0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17668,17 +17668,6 @@ virDomainNVRAMDefFormat(virBufferPtr buf, return 0; } -static int -virDomainSysinfoDefFormat(virBufferPtr buf, - virSysinfoDefPtr def) -{ - int ret; - virBufferAdjustIndent(buf, 2); - ret = virSysinfoFormat(buf, def); - virBufferAdjustIndent(buf, -2); - return ret; -} - static int virDomainWatchdogDefFormat(virBufferPtr buf, @@ -18890,7 +18879,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, virDomainResourceDefFormat(buf, def->resource); if (def->sysinfo) - virDomainSysinfoDefFormat(buf, def->sysinfo); + virSysinfoFormat(buf, def->sysinfo); if (def->os.bootloader) { virBufferEscapeString(buf, "<bootloader>%s</bootloader>\n", diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml b/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml index 7b2f33a..88f953f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml @@ -4,20 +4,24 @@ <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <smbios mode="sysinfo"/> - </os> - <sysinfo type="smbios"> + <sysinfo type='smbios'> <bios> - <entry name="date">999/999/123</entry> + <entry name='date'>11/21/1923</entry> </bios> </sysinfo> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + <smbios mode='sysinfo'/> + </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> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 978e5f1..4c2b928 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -405,6 +405,7 @@ mymain(void) DO_TEST("tap-vhost"); DO_TEST("shmem"); + DO_TEST("smbios-date"); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 2.1.0

2 1

[libvirt] [PATCH] qemu: command: Allow UEFI for non-x86
by Cole Robinson 22 Oct '14

22 Oct '14

It's supported on aarch64 and armv7l as well, so just drop the restriction entirely since it doesn't add much. --- src/qemu/qemu_command.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8cb0865..2872e47 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7672,14 +7672,6 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_LOADER_TYPE_PFLASH: - /* UEFI is supported only for x86_64 currently */ - if (def->os.arch != VIR_ARCH_X86_64) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("pflash is not supported for %s guest architecture"), - virArchToString(def->os.arch)); - goto cleanup; - } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary doesn't support -drive")); -- 2.1.0

3 2

[libvirt] [PATCH 0/3] Fix handling of data returned by XML hooks
by Peter Krempa 22 Oct '14

22 Oct '14

Peter Krempa (3): util: string: Add helper to check whether string is empty qemu: restore: Fix restoring of VM when the restore hook returns empty XML qemu: migration: Make check for empty hook XML robust src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/util/virstring.c | 16 ++++++++++++++++ src/util/virstring.h | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH] doc: HACKING: Regenerate after recent change
by Peter Krempa 22 Oct '14

22 Oct '14

--- Pushed as trivial. HACKING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING b/HACKING index f8546cb..8f42e51 100644 --- a/HACKING +++ b/HACKING @@ -16,7 +16,7 @@ listen to feedback. (2) Official upstream repository is kept in git ("git://libvirt.org/libvirt.git") and is browsable along with other libvirt-related repositories (e.g. -libvirt-python) online <http://libvirt.org>. +libvirt-python) online <http://libvirt.org/git/>. (3) Post patches in unified diff format, with git rename detection enabled. You need a one-time setup of: -- 2.1.0

1 0

[libvirt] [PATCH] docs: fix an improper git browsable address
by Chen Hanxiao 22 Oct '14

22 Oct '14

Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/hacking.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 4ab0179..b1553a5 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -14,7 +14,7 @@ <li>Official upstream repository is kept in git (<code>git://libvirt.org/libvirt.git</code>) and is browsable along with other libvirt-related repositories - (e.g. libvirt-python) <a href="http://libvirt.org">online</a>.</li> + (e.g. libvirt-python) <a href="http://libvirt.org/git/">online</a>.</li> <li><p>Post patches in unified diff format, with git rename detection enabled. You need a one-time setup of:</p> -- 1.9.3

3 2

[libvirt] [libvirt-python PATCH 1/1] virDomainBlockCopy: initialize flags to 0
by Pavel Hrdina 22 Oct '14

22 Oct '14

An optional argument if not passed isn't modified by the PyArg_ParseTuple function. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Sigh :/, pushed as trivial libvirt-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index a461eda..a53b46f 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8171,7 +8171,7 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) char *destxml = NULL; virTypedParameterPtr params = NULL; int nparams = 0; - unsigned int flags; + unsigned int flags = 0; int c_retval; if (!PyArg_ParseTuple(args, (char *) "Ozz|OI:virDomainBlockCopy", -- 2.0.4

2 1

[libvirt] Libvirt clock/time settings doubt.
by Julio Faracco 22 Oct '14

22 Oct '14

Hi everyone! What is the method/function responsible to setup time settings in libvirt? Considering the example of libvirt documentation. <clock offset='localtime'> <timer name='rtc' tickpolicy='catchup' track='guest'> <catchup threshold='123' slew='120' limit='10000'/> </timer> <timer name='pit' tickpolicy='delay'/> </clock> ... I know where this XML will be parsed. But I don't know where libvirt will pass clock/time settings to QEMU. Can somebody explain to me or send me a documentation about it? I passed two weeks trying to discover the sequence of function calls. Thanks guys! *--* *Julio Cesar Faracco*

2 1

[libvirt] [PATCH] Add support for /run/initctl
by Rick Harris 22 Oct '14

22 Oct '14

Newer versions of Debian use `/run/initctl` instead of `/dev/initctl`. This patch updates the code to search for the FIFO from a list of well-known locations. In the FreeBSD case, as before, we fall-back to the `/etc/.initctl` stub. --- src/util/virinitctl.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index a6fda3b..c4b48d4 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -46,12 +46,6 @@ * Copyright (C) 1995-2004 Miquel van Smoorenburg */ -# if defined(__FreeBSD_kernel__) -# define VIR_INITCTL_FIFO "/etc/.initctl" -# else -# define VIR_INITCTL_FIFO "/dev/initctl" -# endif - # define VIR_INITCTL_MAGIC 0x03091969 # define VIR_INITCTL_CMD_START 0 # define VIR_INITCTL_CMD_RUNLVL 1 @@ -124,6 +118,13 @@ virInitctlSetRunLevel(virInitctlRunLevel level) struct virInitctlRequest req; int fd = -1; int ret = -1; + const char *initctl_fifo = NULL; + size_t i = 0; + const char *initctl_fifos[] = { + "/run/initctl", + "/dev/initctl", + "/etc/.initctl", + }; memset(&req, 0, sizeof(req)); @@ -133,22 +134,31 @@ virInitctlSetRunLevel(virInitctlRunLevel level) /* Yes it is an 'int' field, but wants a numeric character. Go figure */ req.runlevel = '0' + level; - if ((fd = open(VIR_INITCTL_FIFO, - O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) < 0) { - if (errno == ENOENT) { - ret = 0; + for (i = 0; i < ARRAY_CARDINALITY(initctl_fifos); i++) { + initctl_fifo = initctl_fifos[i]; + + if ((fd = open(initctl_fifo, + O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) >= 0) + break; + + if (errno != ENOENT) { + virReportSystemError(errno, + _("Cannot open init control %s"), + initctl_fifo); goto cleanup; } - virReportSystemError(errno, - _("Cannot open init control %s"), - VIR_INITCTL_FIFO); + } + + /* Ensure we found a valid initctl fifo */ + if (fd < 0) { + ret = 0; goto cleanup; } if (safewrite(fd, &req, sizeof(req)) != sizeof(req)) { virReportSystemError(errno, _("Failed to send request to init control %s"), - VIR_INITCTL_FIFO); + initctl_fifo); goto cleanup; } -- 1.9.1

2 2