- Devel - libvirt List Archives

[libvirt] [PATCH V2] Do not drop kernel cmdline for xen pv domains
by Jim Fehlig 11 Jul '11

11 Jul '11

Kernel cmdline args can be passed to xen pv domains even when a bootloader is specified. The current config-to-sxpr mapping ignores cmdline when bootloader is present. Since the xend sub-driver is used with many xen toolstack versions, this patch takes conservative approach of adding an else block to existing !def->os.bootloader, and only appends sxpr if def->os.cmdline is non-NULL. V2: Fix existing testcase broken by this patch and add new testcases --- src/xenxs/xen_sxpr.c | 6 ++++ .../sexpr2xml-pv-bootloader-cmdline.sexpr | 5 +++ .../sexpr2xml-pv-bootloader-cmdline.xml | 27 ++++++++++++++++++++ tests/sexpr2xmltest.c | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 1 + .../xml2sexpr-pv-bootloader-cmdline.sexpr | 5 +++ .../xml2sexpr-pv-bootloader-cmdline.xml | 22 ++++++++++++++++ tests/xml2sexprtest.c | 1 + 8 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 13ca015..bd770bc 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -2261,6 +2261,12 @@ xenFormatSxpr(virConnectPtr conn, } virBufferAddLit(&buf, "))"); + } else { + /* PV domains accept kernel cmdline args */ + if (def->os.cmdline) { + virBufferEscapeSexpr(&buf, "(image (linux (args '%s')))", + def->os.cmdline); + } } for (i = 0 ; i < def->ndisks ; i++) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr new file mode 100644 index 0000000..dde37fc --- /dev/null +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr @@ -0,0 +1,5 @@ +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(bootloader '/usr/bin/pygrub')\ +(bootloader_args '-q')(image (linux (args ' xenfb.video=8,1280,1024 ')))\ +(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')\ +(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml new file mode 100644 index 0000000..7bc99d8 --- /dev/null +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml @@ -0,0 +1,27 @@ +<domain type='xen' id='6'> + <name>pvtest</name> + <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> + <memory>430080</memory> + <currentMemory>430080</currentMemory> + <vcpu>2</vcpu> + <bootloader>/usr/bin/pygrub</bootloader> + <bootloader_args>-q</bootloader_args> + <os> + <type>linux</type> + <cmdline> xenfb.video=8,1280,1024 </cmdline> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/root/some.img'/> + <target dev='xvda' bus='xen'/> + </disk> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index f393935..26a987d 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -134,6 +134,7 @@ mymain(void) DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash", 3); DO_TEST("fv-autoport", "fv-autoport", 3); DO_TEST("pv-bootloader", "pv-bootloader", 1); + DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline", 1); DO_TEST("pv-vcpus", "pv-vcpus", 1); DO_TEST("disk-file", "disk-file", 2); diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr index 8c0b1cd..b8387e5 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr @@ -1,6 +1,7 @@ (vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\ (uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')\ (on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\ +(image (linux (args 'ro root=/dev/VolGroup00/LogVol00')))\ (device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\ (mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\ (script 'vif-bridge'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr new file mode 100644 index 0000000..c3ed727 --- /dev/null +++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr @@ -0,0 +1,5 @@ +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\ +(bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\ +(on_crash 'destroy')(image (linux (args ' xenfb.video=8,1280,1024 ')))\ +(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml new file mode 100644 index 0000000..983b7ce --- /dev/null +++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml @@ -0,0 +1,22 @@ +<domain type='xen' id='15'> + <name>pvtest</name> + <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid> + <bootloader>/usr/bin/pygrub</bootloader> + <bootloader_args>-q</bootloader_args> + <os> + <type>linux</type> + <cmdline> xenfb.video=8,1280,1024 </cmdline> + </os> + <memory>430080</memory> + <vcpu>2</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='/root/some.img'/> + <target dev='xvda'/> + </disk> + <console tty='/dev/pts/4'/> + </devices> +</domain> diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index d8cdcbb..e068e69 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -116,6 +116,7 @@ mymain(void) DO_TEST("pv-vfb-new", "pv-vfb-new", "pvtest", 3); DO_TEST("pv-vfb-new-auto", "pv-vfb-new-auto", "pvtest", 3); DO_TEST("pv-bootloader", "pv-bootloader", "pvtest", 1); + DO_TEST("pv-bootloader-cmdline", "pv-bootloader-cmdline", "pvtest", 1); DO_TEST("pv-vcpus", "pv-vcpus", "pvtest", 1); DO_TEST("disk-file", "disk-file", "pvtest", 2); -- 1.7.5.4

3 4

[libvirt] [PATCH] Name domain managed state file with domain UUID
by Osier Yang 11 Jul '11

11 Jul '11

A domain managed state file named with domain name can cause problem if the domain is undefined, and a later new domain is created with the same name. The new domain will not be able to start. --- src/libxl/libxl_driver.c | 4 +++- src/qemu/qemu_driver.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 586d562..7e4e261 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -220,8 +220,10 @@ libxlDoNodeGetInfo(libxlDriverPrivatePtr driver, virNodeInfoPtr info) static char * libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { char *ret; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); - if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, vm->def->name) < 0) { + if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, uuidstr) < 0) { virReportOOMError(); return NULL; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a05a1ee..db77615 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2398,8 +2398,10 @@ cleanup: static char * qemuDomainManagedSavePath(struct qemud_driver *driver, virDomainObjPtr vm) { char *ret; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); - if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, vm->def->name) < 0) { + if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, uuidstr) < 0) { virReportOOMError(); return(NULL); } -- 1.7.6

3 2

[libvirt] [PATCH] RPC: fix argument's name
by Wen Congyang 11 Jul '11

11 Jul '11

--- src/rpc/virnetsocket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 4b0c2ee..3392047 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1042,8 +1042,8 @@ int virNetSocketAccept(virNetSocketPtr sock, virNetSocketPtr *clientsock) } -static void virNetSocketEventHandle(int fd ATTRIBUTE_UNUSED, - int watch ATTRIBUTE_UNUSED, +static void virNetSocketEventHandle(int watch ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, int events, void *opaque) { -- 1.7.1

3 2

[libvirt] [PATCH] kill vm if saving config failed in v3 protocol
by Wen Congyang 11 Jul '11

11 Jul '11

If virDomainSaveConfig() failed, we will return NULL to source, and the vm is still available to restart during confirm() step in v3 protocol. So we should kill it off in qemuMigrationFinish(). In v2 protocol, we should not set vm to NULL, because we hold a reference of vm and should unrefernce it. --- src/qemu/qemu_migration.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 800b714..fa98cba 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2471,7 +2471,7 @@ qemuMigrationFinish(struct qemud_driver *driver, if (!virDomainObjIsActive(vm)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); - goto cleanup; + goto endjob; } qemuMigrationVPAssociatePortProfiles(vm->def); @@ -2491,7 +2491,24 @@ qemuMigrationFinish(struct qemud_driver *driver, * Return a NULL dom pointer, and hope that this is a rare * situation and management tools are smart. */ - vm = NULL; + + /* + * In v3 protocol, the source VM is still available to + * restart during confirm() step, so we kill it off + * now. + * In v2 protocol, the source is dead, so we leave + * target in paused state, in case admin can fix + * things up + */ + if (v3proto) { + qemuProcessStop(driver, vm, 1, VIR_DOMAIN_SHUTOFF_FAILED); + qemuAuditDomainStop(vm, "failed"); + if (newVM) { + if (qemuDomainObjEndJob(vm) > 0) + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + } + } goto endjob; } -- 1.7.1

3 3

[libvirt] [PATCH] fix typo error
by Wen Congyang 11 Jul '11

11 Jul '11

--- docs/news.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/news.html.in b/docs/news.html.in index 6c94afc..625e3b9 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -151,7 +151,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> Support automatic creation of leases for disks in sanlock (Daniel P. Berrange), Support loading a configuration file for sanlock plugin (Daniel P. Berrange), Allow per-driver config file for lock manager plugins (Daniel P. Berrange), - network: add domain to unqualified names defined with <host&g; (Laine Stump), + network: add domain to unqualified names defined with <host> (Laine Stump), Convert libvirtd over to the new RPC handling APIs (Daniel P. Berrange), Convert the remote driver to new RPC client APIs (Daniel P. Berrange), Add XDR_CFLAGS to libvirt-net-rpc.la library (Daniel P. Berrange), -- 1.7.1

3 2

[libvirt] [PATCH] Name domain managed state file with domain UUID
by Osier Yang 11 Jul '11

11 Jul '11

A domain managed state file named with domain name can cause problem if the domain is undefined, and a later new domain is created with the same name. The new domain will not be able to start. --- src/libxl/libxl_driver.c | 4 +++- src/qemu/qemu_driver.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 586d562..7e4e261 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -220,8 +220,10 @@ libxlDoNodeGetInfo(libxlDriverPrivatePtr driver, virNodeInfoPtr info) static char * libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { char *ret; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); - if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, vm->def->name) < 0) { + if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, uuidstr) < 0) { virReportOOMError(); return NULL; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a05a1ee..db77615 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2398,8 +2398,10 @@ cleanup: static char * qemuDomainManagedSavePath(struct qemud_driver *driver, virDomainObjPtr vm) { char *ret; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); - if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, vm->def->name) < 0) { + if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, uuidstr) < 0) { virReportOOMError(); return(NULL); } -- 1.7.6

1 0

[libvirt] [PATCH 0/7] Add support for setting QoS
by Michal Privoznik 11 Jul '11

11 Jul '11

This patch series add support for setting traffic shaping and policing on both domain's interface and network's virtual bridge. Basically, this is done via 'tc' from iproute2 package. For shaping is HTB used, for policing we need u32 match selector. Both should be available in RHEL-6 kernel. Michal Privoznik (7): bandwidth: Define schema and create documentation bandwidth: Declare internal structures bandwidth: Add format parsing functions bandwidth: Create format functions bandwitdh: Implement functions to enable and disable QoS bandwidth: Add test cases for network bandwidth: Add domain schema test suite configure.ac | 4 + docs/formatdomain.html.in | 32 ++ docs/formatnetwork.html.in | 30 ++ docs/schemas/domain.rng | 50 +++ docs/schemas/network.rng | 51 +++ src/conf/domain_conf.c | 6 + src/conf/domain_conf.h | 1 + src/conf/network_conf.c | 8 + src/conf/network_conf.h | 1 + src/libvirt_private.syms | 6 + src/network/bridge_driver.c | 8 + src/qemu/qemu_command.c | 5 + src/util/network.c | 508 +++++++++++++++++++++++++ src/util/network.h | 28 ++ tests/domainschemadata/domain-bandwidth.xml | 72 ++++ tests/networkxml2xmlin/bandwidth-network.xml | 16 + tests/networkxml2xmlout/bandwidth-network.xml | 16 + tests/networkxml2xmltest.c | 1 + 18 files changed, 843 insertions(+), 0 deletions(-) create mode 100644 tests/domainschemadata/domain-bandwidth.xml create mode 100644 tests/networkxml2xmlin/bandwidth-network.xml create mode 100644 tests/networkxml2xmlout/bandwidth-network.xml -- 1.7.5.rc3

5 18

[libvirt] [PATCH v3] bios: Add support for SGA
by Michal Privoznik 11 Jul '11

11 Jul '11

This patch creates new <bios> element which, at this time has the only attribute useserial='yes|no'. This attribute allow users to use Serial Graphics Adapter and see BIOS messages from the very first moment domain boots up. Therefore, users can choose boot medium, set PXE, etc. --- diff to v2: -move from <serial> to <bios> -include Eric's and Dan's suggestions diff to v1: -move from <video> to <serial> as Dan suggested: https://www.redhat.com/archives/libvir-list/2011-July/msg00134.html docs/formatdomain.html.in | 9 ++++++ docs/schemas/domain.rng | 14 +++++++++ src/conf/domain_conf.c | 27 ++++++++++++++++- src/conf/domain_conf.h | 13 ++++++++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 20 +++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-bios.args | 6 ++++ tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 39 +++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 10 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 10d87a9..9cc0bca 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -86,6 +86,7 @@ <boot dev='cdrom'/> <bootmenu enable='yes'/> <smbios mode='sysinfo'/> + <bios useserial='yes'/> </os> ...</pre> @@ -137,6 +138,14 @@ specified, the hypervisor default is used. Since 0.8.7 </dd> + <dt><code>bios</code></dt> + <dd>This element has attribute <code>useserial</code> with possible + values <code>yes</code> or <code>no</code>. It enables or disables + Serial Graphics Adapter which allows users to see BIOS messages + on a serial port. Therefore, one need to have + <a href="#elementCharSerial">serial port</a> defined. + Since 0.9.4 + </dd> </dl> <h4><a name="elementsOSBootloader">Host bootloader</a></h4> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 3c8414e..2d3b3cd 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -151,6 +151,9 @@ <optional> <ref name="smbios"/> </optional> + <optional> + <ref name="bios"/> + </optional> </interleave> </element> </define> @@ -2261,6 +2264,17 @@ </element> </define> + <define name="bios"> + <element name="bios"> + <attribute name="useserial"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </element> + </define> + <define name="address"> <element name="address"> <choice> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2275d3a..eaafa15 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5628,9 +5628,9 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, { xmlNodePtr *nodes = NULL; int i, n; - char *bootstr; + char *bootstr, *useserial; int ret = -1; - unsigned long deviceBoot; + unsigned long deviceBoot, serialPorts; if (virXPathULong("count(./devices/disk[boot]" "|./devices/interface[boot]" @@ -5684,6 +5684,22 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, VIR_FREE(bootstr); } + useserial = virXPathString("string(./os/bios[1]/@useserial)", ctxt); + if (useserial) { + if (STREQ(useserial, "yes")) { + if (virXPathULong("count(./devices/serial)", + ctxt, &serialPorts) < 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("need at least one serial port " + "for useserial")); + goto cleanup; + } + def->os.bios.useserial = VIR_DOMAIN_BIOS_USESERIAL_YES; + } else { + def->os.bios.useserial = VIR_DOMAIN_BIOS_USESERIAL_NO; + } + } + *bootCount = deviceBoot; ret = 0; @@ -9720,6 +9736,13 @@ char *virDomainDefFormat(virDomainDefPtr def, : "no"); virBufferAsprintf(&buf, " <bootmenu enable='%s'/>\n", enabled); } + + if (def->os.bios.useserial) { + const char *useserial = (def->os.bios.useserial == + VIR_DOMAIN_BIOS_USESERIAL_YES ? "yes" + : "no"); + virBufferAsprintf(&buf, " <bios useserial='%s'/>\n", useserial); + } } if (def->os.smbios_mode) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ddfe18e..71cb145 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -923,6 +923,18 @@ enum virDomainLifecycleCrashAction { VIR_DOMAIN_LIFECYCLE_CRASH_LAST }; +enum virDomainBIOSUseserial { + VIR_DOMAIN_BIOS_USESERIAL_DEFAULT = 0, + VIR_DOMAIN_BIOS_USESERIAL_YES, + VIR_DOMAIN_BIOS_USESERIAL_NO +}; + +typedef struct _virDomainBIOSDef virDomainBIOSDef; +typedef virDomainBIOSDef *virDomainBIOSDefPtr; +struct _virDomainBIOSDef { + int useserial; +}; + /* Operating system configuration data & machine / arch */ typedef struct _virDomainOSDef virDomainOSDef; typedef virDomainOSDef *virDomainOSDefPtr; @@ -942,6 +954,7 @@ struct _virDomainOSDef { char *bootloader; char *bootloaderArgs; int smbios_mode; + virDomainBIOSDef bios; }; enum virDomainSeclabelType { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c037ce..1421a5e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -122,6 +122,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-multifunction", /* 60 */ "virtio-blk-pci.ioeventfd", + "sga", ); struct qemu_feature_flags { @@ -1212,6 +1213,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_DEVICE_QXL_VGA); if (strstr(str, "virtio-blk-pci.ioeventfd")) qemuCapsSet(flags, QEMU_CAPS_VIRTIO_IOEVENTFD); + if (strstr(str, "name \"sga\"")) + qemuCapsSet(flags, QEMU_CAPS_SGA); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0b9c8be..d251262 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -97,6 +97,7 @@ enum qemuCapsFlags { QEMU_CAPS_DEVICE_QXL_VGA = 59, /* Is the primary and vga campatible qxl device named qxl-vga? */ QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* IOeventFD feature: virtio-{net|blk}-pci.ioeventfd=on/off */ + QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ 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 6e4480e..7eb721c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3060,6 +3060,26 @@ qemuBuildCommandLine(virConnectPtr conn, "-nodefaults"); /* Disable default guest devices */ } + /* Serial graphics adapter */ + if (def->os.bios.useserial == VIR_DOMAIN_BIOS_USESERIAL_YES) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu does not support -device")); + goto error; + } + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SGA)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu does not support SGA")); + goto error; + } + if (!def->nserials) { + qemuReportError(VIR_ERR_XML_ERROR, "%s", + _("need at least one serial port to use SGA")); + goto error; + } + virCommandAddArgList(cmd, "-device", "sga", NULL); + } + if (monitor_chr) { char *chrdev; /* Use -chardev if it's available */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args new file mode 100644 index 0000000..f9727c4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nodefaults -device sga \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-hda /dev/HostVG/QEMUGuest1 -serial pty \ +-usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml new file mode 100644 index 0000000..5ce3e24 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml @@ -0,0 +1,39 @@ +<domain type='qemu'> + <name>test-bios</name> + <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + <bootmenu enable='yes'/> + <bios useserial='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='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='tablet' bus='usb'/> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='5900' autoport='no' listen='127.0.0.1'/> + <video> + <model type='cirrus' vram='9216' heads='1'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ec1f4b5..2e6c546 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -287,6 +287,7 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_BOOTINDEX); DO_TEST("bootloader", true, QEMU_CAPS_DOMID); + DO_TEST("bios", false, QEMU_CAPS_DEVICE, QEMU_CAPS_SGA); DO_TEST("clock-utc", false, NONE); DO_TEST("clock-localtime", false, NONE); /* -- 1.7.5.rc3

2 2

[libvirt] Exposing qemu support for SDL via capabilities
by Adam Litke 11 Jul '11

11 Jul '11

Hi all, In order to nicely support domains that use qemu's SDL support, libvirt-cim is looking for a way to confirm if the underlying qemu emulator can support SDL. Libvirt already knows this information internally. It seems to me that the best way to provide this information is by reporting it as a guest feature via the capabilities API call. I was thinking the node '/capabilities/guest/features/sdl' could be added when qemu supports SDL. Is this a good idea? -- Adam Litke IBM Linux Technology Center

3 3

[libvirt] [BUG] event's bug?
by Wen Congyang 11 Jul '11

11 Jul '11

Steps to produce this bug: 1. # virsh migrate vm1 --p2p qemu+tls://<remote host>/system error: End of file while reading data: Input/output error Now the libvirtd crashed. This bug only happened twice. I use gdb to analyze the core file: (gdb) info threads 6 Thread 3952 0x000000351fe0b43c in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 5 Thread 3951 0x000000351fe0b43c in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 4 Thread 3950 0x000000351fe0b43c in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 3 Thread 3949 0x000000351fe0b43c in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 2 Thread 3948 0x000000351fe0b43c in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 * 1 Thread 3947 0x0000000000000000 in ?? () (gdb) bt #0 0x0000000000000000 in ?? () #1 0x0000003f2a834150 in _gnutls_string_resize (dest=0x7f92740079d8, new_size=<value optimized out>) at gnutls_str.c:192 #2 0x0000003f2a81a614 in _gnutls_io_read_buffered (session=0x7f9274006d30, iptr=0x7fffb3476148, sizeOfPtr=5, recv_type=<value optimized out>) at gnutls_buffers.c:515 #3 0x0000003f2a816031 in _gnutls_recv_int (session=0x7f9274006d30, type=GNUTLS_APPLICATION_DATA, htype=4294967295, data=0x7f92740155e8 "", sizeofdata=4) at gnutls_record.c:904 #4 0x00007f9285bd2ec7 in virNetTLSSessionRead (sess=0x7f927400a5d0, buf=0x7f92740155e8 "", len=4) at rpc/virnettlscontext.c:812 #5 0x00007f9285bd50a4 in virNetSocketReadWire (sock=0x7f9274006ba0, buf=0x7f92740155e8 "", len=4) at rpc/virnetsocket.c:801 #6 0x00007f9285bd5815 in virNetSocketRead (sock=0x7f9274006ba0, buf=0x7f92740155e8 "", len=4) at rpc/virnetsocket.c:981 #7 0x00007f9285bce40f in virNetClientIOReadMessage (client=0x7f9274015590) at rpc/virnetclient.c:711 #8 0x00007f9285bce461 in virNetClientIOHandleInput (client=0x7f9274015590) at rpc/virnetclient.c:730 #9 0x00007f9285bcf0f4 in virNetClientIncomingEvent (sock=0x7f9274006ba0, events=1, opaque=0x7f9274015590) at rpc/virnetclient.c:1119 #10 0x00007f9285bd5b87 in virNetSocketEventHandle (fd=13, watch=20, events=1, opaque=0x7f9274006ba0) at rpc/virnetsocket.c:1052 #11 0x00007f9285b09325 in virEventPollDispatchHandles (nfds=10, fds=0xfe51d0) at util/event_poll.c:469 #12 0x00007f9285b09a7e in virEventPollRunOnce () at util/event_poll.c:610 #13 0x00007f9285b07ec5 in virEventRunDefaultImpl () at util/event.c:247 #14 0x0000000000449cc2 in virNetServerRun (srv=0xfc3490) at rpc/virnetserver.c:662 #15 0x000000000041e3c5 in main (argc=2, argv=0x7fffb3476b68) at libvirtd.c:1561 The debug log in /var/log/libvirt/libvirtd.log: ... 11:18:27.838: 1848: debug : virEventPollRemoveHandle:171 : Remove handle w=13 11:18:27.838: 1847: debug : virEventPollDispatchHandles:454 : i=3 w=4 11:18:27.838: 1847: debug : virEventPollDispatchHandles:454 : i=4 w=5 11:18:27.838: 1847: debug : virEventPollDispatchHandles:454 : i=5 w=6 11:18:27.838: 1847: debug : virEventPollDispatchHandles:454 : i=6 w=12 11:18:27.838: 1847: debug : virEventPollDispatchHandles:454 : i=7 w=13 11:18:27.838: 1847: debug : virEventPollDispatchHandles:467 : Dispatch n=7 f=20 w=13 e=1 0x7f00780aaa80 11:18:27.838: 1848: debug : virEventPollRemoveHandle:184 : mark delete 7 20 11:18:27.838: 1848: debug : virEventPollInterruptLocked:677 : Interrupting 11:18:27.838: 1848: debug : virNetSocketFree:627 : sock=0x7f00780aaa80 fd=20 11:18:27.838: 1848: debug : virEventPollRemoveTimeout:276 : Remove timer 10 11:18:27.838: 1848: debug : virEventPollInterruptLocked:677 : Interrupting 11:18:27.838: 1848: debug : virDomainObjUnref:1142 : obj=0x7f007800ce10 refs=2 11:18:27.838: 1848: debug : virDomainObjUnref:1142 : obj=0x7f007800ce10 refs=1 ====== end of log ===== The reason is that: we dispatch handle(fd = 20, watch=13) and remove the handle(watch=13) almost at the same time(The order is: dispatch, remove) We remove the handle when remote connection is closed, and we will call virNetSocketFree() to free sock, but we still use sock in another thread. It's very dangerous!!! I think we should wait dispatching a handle when removing the same handle.

1 0

[libvirt] [PATCH] vbox: Fix logic in storage driver open function
by Matthias Bolte 09 Jul '11

09 Jul '11

If the main driver is the vbox driver, then the open function has to return an error if the private data is invalid. --- src/vbox/vbox_tmpl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 37fe248..dfa676e 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -7753,19 +7753,16 @@ static virDrvOpenStatus vboxStorageOpen (virConnectPtr conn, vboxGlobalData *data = conn->privateData; if (STRNEQ(conn->driver->name, "VBOX")) - goto cleanup; + return VIR_DRV_OPEN_DECLINED; if ((data->pFuncs == NULL) || (data->vboxObj == NULL) || (data->vboxSession == NULL)) - goto cleanup; + return VIR_DRV_OPEN_ERROR; VIR_DEBUG("vbox storage initialized"); /* conn->storagePrivateData = some storage specific data */ return VIR_DRV_OPEN_SUCCESS; - -cleanup: - return VIR_DRV_OPEN_DECLINED; } static int vboxStorageClose (virConnectPtr conn) { -- 1.7.4.1

2 2

[libvirt] [PATCH] rpc: Fix whitespace problem in generated code
by Matthias Bolte 08 Jul '11

08 Jul '11

Add missing line break and fix indention level. Reported by Cole Robinson. --- Pushing this under the trivial rule. src/rpc/gendispatch.pl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 027560c..c69c5a2 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1350,11 +1350,11 @@ elsif ($opt_k) { if ($call->{streamflag} ne "none") { print "\n"; print " if (!(netst = virNetClientStreamNew(priv->remoteProgram, REMOTE_PROC_$call->{UC_NAME}, priv->counter)))\n"; - print " goto done;\n"; + print " goto done;\n"; print "\n"; - print " if (virNetClientAddStream(priv->client, netst) < 0) {"; - print " virNetClientStreamFree(netst);\n"; - print " goto done;\n"; + print " if (virNetClientAddStream(priv->client, netst) < 0) {\n"; + print " virNetClientStreamFree(netst);\n"; + print " goto done;\n"; print " }"; print "\n"; print " st->driver = &remoteStreamDrv;\n"; -- 1.7.4.1

1 0

[libvirt] [PATCH 00/20] flags cleanup
by Eric Blake 08 Jul '11

08 Jul '11

Inspired in part by Laine's recent cleanup of qemuDomainGetXMLDesc, in part by my desire to add a new flag to virDomainCoreDump and test that older clients reject that flag, and in part by an OCD desire for uniformity :), I'm proposing this giant patch series. Eric Blake (20): maint: print flags in hex during debug public API: prefer unsigned int for flags drivers: prefer unsigned int for flags conf: prefer unsigned int for flags util: drop unused safezero argument util: reject unknown flags node_device: reject unknown flags storage: reject unknown flags esx: reject unknown flags libxl: reject unknown flags lxc: reject unknown flags openvz: reject unknown flags phyp: reject unknown flags qemu: reject unknown flags test: reject unknown flags uml: reject unknown flags vbox: reject unknown flags vmware: reject unknown flags xen: reject unknown flags xenapi: reject unknown flags include/libvirt/libvirt.h.in | 10 +- src/conf/domain_conf.c | 86 +++++++------ src/driver.h | 10 +- src/esx/esx_device_monitor.c | 6 +- src/esx/esx_driver.c | 31 ++++- src/esx/esx_interface_driver.c | 6 +- src/esx/esx_network_driver.c | 6 +- src/esx/esx_nwfilter_driver.c | 5 +- src/esx/esx_secret_driver.c | 6 +- src/esx/esx_storage_driver.c | 6 +- src/interface/netcf_driver.c | 18 ++- src/libvirt.c | 228 +++++++++++++++++---------------- src/libxl/libxl_driver.c | 22 ++- src/locking/lock_driver_sanlock.c | 4 +- src/lxc/lxc_driver.c | 14 ++- src/network/bridge_driver.c | 11 ++- src/node_device/node_device_driver.c | 18 ++- src/node_device/node_device_hal.c | 5 +- src/node_device/node_device_udev.c | 4 +- src/nodeinfo.h | 6 +- src/nwfilter/nwfilter_driver.c | 10 +- src/openvz/openvz_driver.c | 11 +- src/phyp/phyp_driver.c | 14 ++- src/qemu/qemu_driver.c | 36 ++++-- src/qemu/qemu_migration.c | 16 ++- src/remote/remote_driver.c | 24 ++-- src/remote/remote_protocol.x | 10 +- src/remote_protocol-structs | 10 +- src/secret/secret_driver.c | 17 ++- src/storage/storage_backend.c | 16 ++- src/storage/storage_backend_disk.c | 10 +- src/storage/storage_backend_fs.c | 26 +++- src/storage/storage_backend_iscsi.c | 4 +- src/storage/storage_backend_logical.c | 18 ++- src/storage/storage_driver.c | 45 +++++-- src/test/test_driver.c | 150 +++++++++++++++++----- src/uml/uml_driver.c | 14 ++- src/util/logging.c | 10 +- src/util/util.c | 6 +- src/util/util.h | 2 +- src/vbox/vbox_driver.c | 7 +- src/vbox/vbox_tmpl.c | 47 ++++++-- src/vmware/vmware_driver.c | 19 ++- src/xen/xen_driver.c | 18 ++- src/xen/xen_hypervisor.c | 8 +- src/xen/xen_hypervisor.h | 2 +- src/xen/xen_inotify.c | 8 +- src/xen/xen_inotify.h | 3 +- src/xen/xend_internal.c | 20 ++- src/xen/xend_internal.h | 5 +- src/xen/xm_internal.c | 8 +- src/xen/xm_internal.h | 5 +- src/xen/xs_internal.c | 14 ++- src/xen/xs_internal.h | 4 +- src/xenapi/xenapi_driver.c | 14 ++- 55 files changed, 754 insertions(+), 379 deletions(-) -- 1.7.4.4

4 49

[libvirt] [PROPOSED PATCH] Change the creation of the TAP interface for generic ethernet interfaces
by Tyler Coumbes 08 Jul '11

08 Jul '11

Currently with libvirt and qemu/kvm to use the generic ethernet interface you have to use the workarounds listed in http://fedoraproject.org/wiki/How_to_debug_Virtualization_problems#Errors_u… . This is required since the current method relies on qemu to create the TAP interface. This was reported in the past as https://bugzilla.redhat.com/show_bug.cgi?id=593903 , https://bugzilla.redhat.com/show_bug.cgi?id=593903 and https://bugzilla.redhat.com/show_bug.cgi?id=559154 . The tickets were closed with the work around stated as the fix. I have created a patch to fix the issue above and avoid the work around from the Fedora wiki requiring qemu to run as root, clear_emulator_capabilities = 1 to be set in qemu.conf, and to put SELinux into permissive mode. All three are required on Fedora 15 for a generic ethernet interface to work. This work around places the host and guests in a much more vulnerable state. I have written this against the version that ships with Fedora 15 (libvirt-0.8.8). I looked at the latest code and it appears not much has changed and I should be able to clean up the patch and apply it to the trunk. If there is interest I will clean up the patch and submit it to the list for review. The code changes it so that the TAP interface is created by libvirt and then the file descriptor is passed to qemu. Much like what is done when using bridged networking. This is done using fd= instead of ifname= just like with the bridged networking. The script= parameter is not supported with fd= so I will assume the old method will still need to be supported for backwards compatibility. What would be the best way to implement the config xml? I have not changed any xml config code yet and am looking for input on the best method. A couple of options I can think of are below. Current example which uses ifname= listed for reference (http://libvirt.org/formatdomain.html#elementsNICSEthernet) <interface type='ethernet'> <target dev='tap0'/> <script path='/etc/qemu-ifup'/> </interface> Option 1: Proposed change would be that if there is no script parameter it is assumed that fd= is used instead of ifname= and if script= is present then use ifname= Would use fd= after the patch. <interface type='ethernet'> <target dev='tap0'/> </interface> Would use ifname= after patch since it has a script= parameter. If a script parameter is needed the work around would still need to be in place. <interface type='ethernet'> <target dev='tap0'/> <script path='/etc/qemu-ifup'/> </interface> Option 2: Adding a mode parameter to the <target /> tag. mode could be either fd or ifname. If the mode is ifname then <script path=''/> would be valid. If the mode is left off and there is no script parameter than I would propose that fd= be used. If that would be an issue then ifname= could be used if the mode parameter is left off. <interface type='ethernet'> <target dev='tap0' mode='fd'/> </interface> Option 3: Something completely different then above ;-) I like option 1 unless anyone sees an issue with that method. For example this would allow for use of openvswitch with libvirt and I am sure other types of setups while still leaving sVirt enabled. I have tested a patched libvirt with an openvswitch setup. You create the TAP interface with libvirt in this manner and then add those TAP interfaces to openvswitch assigning VLANs and other attributes as needed. I am not proposing this as the long term supported method for openvswitch integration, but this allows for much more flexible networking with out sacrificing security or backwards compatibility. Thanks, Tyler Coumbes

2 1

[libvirt] Fwd: Re: [virt-tools-list] virtinst-0.500.6 question, clean build environment issues
by Jason Helfman 08 Jul '11

08 Jul '11

Any help from the authors on this one? Thanks! Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

1 0

[libvirt] [PATCH] sanlock: avoid lockspace setup when auto_disk_lease is off
by Federico Simoncelli 08 Jul '11

08 Jul '11

When auto_disk_lease is off we should avoid the automatic lockspace creation. Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index cd2bbb5..29d4176 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -294,8 +294,10 @@ static int virLockManagerSanlockInit(unsigned int version, goto error; } - if (virLockManagerSanlockSetupLockspace() < 0) - goto error; + if (driver->autoDiskLease) { + if (virLockManagerSanlockSetupLockspace() < 0) + goto error; + } return 0; -- 1.7.1

2 1

[libvirt] [PATCH 2/2] qemu: clean up OOM checks
by Michael Santos 08 Jul '11

08 Jul '11

--- src/qemu/qemu_command.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6e4480e..19151ce 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5712,6 +5712,9 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, else feature = strdup(p); + if (!feature) + goto no_memory; + ret = virCPUDefAddFeature(cpu, feature, policy); VIR_FREE(feature); if (ret < 0) @@ -6028,6 +6031,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, if (STREQ(arg, "-cdrom")) { disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; disk->dst = strdup("hdc"); + if (!disk->dst) + goto no_memory; disk->readonly = 1; } else { if (STRPREFIX(arg, "-fd")) { @@ -6041,8 +6046,12 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; } disk->dst = strdup(arg + 1); + if (!disk->dst) + goto no_memory; } disk->src = strdup(val); + if (!disk->src) + goto no_memory; if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) { char *host, *port; @@ -6058,17 +6067,14 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, goto error; } *port++ = '\0'; - if (VIR_ALLOC(disk->hosts) < 0) { - virReportOOMError(); - goto error; - } + if (VIR_ALLOC(disk->hosts) < 0) + goto no_memory; disk->nhosts = 1; disk->hosts->name = host; disk->hosts->port = strdup(port); - if (!disk->hosts->port) { - virReportOOMError(); - goto error; - } + if (!disk->hosts->port) + goto no_memory; + VIR_FREE(disk->src); disk->src = NULL; break; case VIR_DOMAIN_DISK_PROTOCOL_RBD: @@ -6088,22 +6094,16 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, goto error; } *vdi++ = '\0'; - if (VIR_ALLOC(disk->hosts) < 0) { - virReportOOMError(); - goto error; - } + if (VIR_ALLOC(disk->hosts) < 0) + goto no_memory; disk->nhosts = 1; disk->hosts->name = disk->src; disk->hosts->port = strdup(port); - if (!disk->hosts->port) { - virReportOOMError(); - goto error; - } + if (!disk->hosts->port) + goto no_memory; disk->src = strdup(vdi); - if (!disk->src) { - virReportOOMError(); - goto error; - } + if (!disk->src) + goto no_memory; } break; } -- 1.7.0.4

2 1

[libvirt] [PATCH 1/2] qemu: return error condition
by Michael Santos 08 Jul '11

08 Jul '11

--- src/qemu/qemu_bridge_filter.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c index f700631..03ed284 100644 --- a/src/qemu/qemu_bridge_filter.c +++ b/src/qemu/qemu_bridge_filter.c @@ -78,6 +78,7 @@ networkAllowMacOnPort(struct qemud_driver *driver, virReportSystemError(err, _("failed to add ebtables rule to allow routing to '%s'"), ifname); + return err; } return 0; @@ -99,6 +100,7 @@ networkDisallowMacOnPort(struct qemud_driver *driver, virReportSystemError(err, _("failed to add ebtables rule to allow routing to '%s'"), ifname); + return err; } return 0; -- 1.7.0.4

2 1

[libvirt] [PATCH v4] graphics: add support for action_if_connected in qemu
by Michal Privoznik 08 Jul '11

08 Jul '11

This option accepts 3 values: -keep, to keep current client connected (Spice+VNC) -disconnect, to disconnect client (Spice) -fail, to fail setting password if there is a client connected (Spice) --- diff to v3: -rebase to current HEAD & resend diff to v2: -fixed typo -added test. However, functionality provided by this patch will show up only when talking to qemu monitor (set_password command). diff to v1: -Eric's review suggestions included -update 'Since' docs/formatdomain.html.in | 13 +++++- docs/schemas/domain.rng | 16 +++++++ src/conf/domain_conf.c | 44 ++++++++++++++++++- src/conf/domain_conf.h | 11 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_hotplug.c | 15 +++++- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- 7 files changed, 94 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3a64983..ad15c35 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1878,7 +1878,11 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. + assumed to be in UTC. Since 0.8.5 + The <code>connected</code> attribute allows control of connected client + during password changes. VNC accepts <code>keep</code> value only. + since 0.9.4 + NB, this may not be supported by all hypervisors. Rather than using listen/port, QEMU supports a <code>socket</code> attribute for listening on a unix domain socket path. @@ -1897,7 +1901,12 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. + assumed to be in UTC. Since 0.8.5 + The <code>connected</code> attribute allows control of connected client + during password changes. SPICE accepts <code>keep</code> to keep client + connected, <code>disconnect</code> to disconnect client and + <code>fail</code> to fail changing password. Since 0.9.4 + NB, this may not be supported by all hypervisors. "spice" since 0.8.6. diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 891662d..241dda5 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1284,6 +1284,13 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>keep</value> + </choice> + </attribute> + </optional> </group> <group> <attribute name="type"> @@ -1327,6 +1334,15 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>fail</value> + <value>disconnect</value> + <value>keep</value> + </choice> + </attribute> + </optional> <interleave> <zeroOrMore> <element name="channel"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f9bf51e..c44d64a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -317,6 +317,13 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "desktop", "spice") +VIR_ENUM_IMPL(virDomainGraphicsAuthConnected, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST, + "default", + "fail", + "disconnect", + "keep") + VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName, VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST, "main", @@ -3942,9 +3949,12 @@ error: static int -virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr def) +virDomainGraphicsAuthDefParseXML(xmlNodePtr node, + virDomainGraphicsAuthDefPtr def, + int type) { char *validTo = NULL; + char *connected = virXMLPropString(node, "connected"); def->passwd = virXMLPropString(node, "passwd"); @@ -3985,6 +3995,28 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr de def->expires = 1; } + if (connected) { + int action = virDomainGraphicsAuthConnectedTypeFromString(connected); + if (action <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown connected value %s"), + connected); + VIR_FREE(connected); + return -1; + } + VIR_FREE(connected); + + /* VNC supports connected='keep' only */ + if (type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + action != VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("VNC supports connected='keep' only")); + return -1; + } + + def->connected = action; + } + return 0; } @@ -4054,7 +4086,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.vnc.listenAddr[0]) VIR_FREE(def->data.vnc.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth, + def->type) < 0) goto error; } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *fullscreen = virXMLPropString(node, "fullscreen"); @@ -4190,7 +4223,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.spice.listenAddr[0]) VIR_FREE(def->data.spice.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth, + def->type) < 0) goto error; cur = node->children; @@ -9231,6 +9265,10 @@ virDomainGraphicsAuthDefFormatAttr(virBufferPtr buf, strftime(strbuf, sizeof(strbuf), "%Y-%m-%dT%H:%M:%S", tm); virBufferAsprintf(buf, " passwdValidTo='%s'", strbuf); } + + if (def->connected) + virBufferEscapeString(buf, " connected='%s'", + virDomainGraphicsAuthConnectedTypeToString(def->connected)); } static int diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e81977c..bff1c53 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -639,12 +639,22 @@ enum virDomainGraphicsType { VIR_DOMAIN_GRAPHICS_TYPE_LAST, }; +enum virDomainGraphicsAuthConnectedType { + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DEFAULT = 0, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DISCONNECT, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP, + + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST +}; + typedef struct _virDomainGraphicsAuthDef virDomainGraphicsAuthDef; typedef virDomainGraphicsAuthDef *virDomainGraphicsAuthDefPtr; struct _virDomainGraphicsAuthDef { char *passwd; unsigned int expires: 1; /* Whether there is an expiry time set */ time_t validTo; /* seconds since epoch */ + int connected; /* action if connected */ }; enum virDomainGraphicsSpiceChannelName { @@ -1579,6 +1589,7 @@ VIR_ENUM_DECL(virDomainHostdevSubsys) VIR_ENUM_DECL(virDomainInput) VIR_ENUM_DECL(virDomainInputBus) VIR_ENUM_DECL(virDomainGraphics) +VIR_ENUM_DECL(virDomainGraphicsAuthConnected) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode) VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 626ac6c..89aeac9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -270,6 +270,8 @@ virDomainFindByID; virDomainFindByName; virDomainFindByUUID; virDomainGetRootFilesystem; +virDomainGraphicsAuthConnectedTypeFromString; +virDomainGraphicsAuthConnectedTypeToString; virDomainGraphicsDefFree; virDomainGraphicsSpiceChannelModeTypeFromString; virDomainGraphicsSpiceChannelModeTypeToString; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a7f11ab..58689f6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1065,10 +1065,12 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, return -1; } - /* If a password lifetime was, or is set, then we must always run, - * even if new password matches old password */ + /* If a password lifetime was, or is set, or action if connected has + * changed, then we must always run, even if new password matches + * old password */ if (olddev->data.vnc.auth.expires || dev->data.vnc.auth.expires || + olddev->data.vnc.auth.connected != dev->data.vnc.auth.connected || STRNEQ_NULLABLE(olddev->data.vnc.auth.passwd, dev->data.vnc.auth.passwd)) { VIR_DEBUG("Updating password on VNC server %p %p", @@ -1084,6 +1086,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.vnc.auth.passwd = NULL; olddev->data.vnc.auth.validTo = dev->data.vnc.auth.validTo; olddev->data.vnc.auth.expires = dev->data.vnc.auth.expires; + olddev->data.vnc.auth.connected = dev->data.vnc.auth.connected; } else { ret = 0; } @@ -1116,6 +1119,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, * even if new password matches old password */ if (olddev->data.spice.auth.expires || dev->data.spice.auth.expires || + olddev->data.spice.auth.connected != dev->data.spice.auth.connected || STRNEQ_NULLABLE(olddev->data.spice.auth.passwd, dev->data.spice.auth.passwd)) { VIR_DEBUG("Updating password on SPICE server %p %p", @@ -1131,6 +1135,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.spice.auth.passwd = NULL; olddev->data.spice.auth.validTo = dev->data.spice.auth.validTo; olddev->data.spice.auth.expires = dev->data.spice.auth.expires; + olddev->data.spice.auth.connected = dev->data.spice.auth.connected; } else { VIR_DEBUG("Not updating since password didn't change"); ret = 0; @@ -1874,16 +1879,20 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; time_t now = time(NULL); char expire_time [64]; + const char *connected = NULL; int ret; if (!auth->passwd && !driver->vncPassword) return 0; + if (auth->connected) + connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected); + qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetPassword(priv->mon, type, auth->passwd ? auth->passwd : defaultPasswd, - NULL); + connected); if (ret == -2) { if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml index 4c0c57e..6389de5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml @@ -71,7 +71,7 @@ </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> - <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22'/> + <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/> <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </sound> -- 1.7.5.rc3

2 4

[libvirt] [PATCH 0/5] Fix misc problems in the RPC code
by Daniel P. Berrange 08 Jul '11

08 Jul '11

This series of patches fixes a couple of memory leaks, one crash and a missing reply to the final RPC message on a connection being closed

2 10

[libvirt] [PATCH] Fix mistaken order of server cert/key parameters in constructor
by Daniel P. Berrange 08 Jul '11

08 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virNetTLSContextNew was being passed key/cert parameters in the wrong order. This wasn't immediately visible because if virNetTLSContextNewPath was used, a second bug reversed the order of those parameters again. Only if the paths were manually specified in /etc/libvirt/libvirtd.conf did the bug appear * src/rpc/virnettlscontext.c: Fix order of params passed to virNetTLSContextNew --- src/rpc/virnettlscontext.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index ad8e2dc..1120e1e 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -396,10 +396,10 @@ static virNetTLSContextPtr virNetTLSContextNewPath(const char *pkipath, virNetTLSContextPtr ctxt = NULL; if (virNetTLSContextLocateCredentials(pkipath, tryUserPkiPath, isServer, - &cacert, &cacrl, &key, &cert) < 0) + &cacert, &cacrl, &cert, &key) < 0) return NULL; - ctxt = virNetTLSContextNew(cacert, cacrl, key, cert, + ctxt = virNetTLSContextNew(cacert, cacrl, cert, key, x509dnWhitelist, requireValidCert, isServer); VIR_FREE(cacert); @@ -435,7 +435,7 @@ virNetTLSContextPtr virNetTLSContextNewServer(const char *cacert, const char *const*x509dnWhitelist, bool requireValidCert) { - return virNetTLSContextNew(cacert, cacrl, key, cert, + return virNetTLSContextNew(cacert, cacrl, cert, key, x509dnWhitelist, requireValidCert, true); } -- 1.7.6

2 1

[libvirt] [PATCH] util: Don't try to fchown files opened as non-root
by Jiri Denemark 08 Jul '11

08 Jul '11

When virFileOpenAs is called with VIR_FILE_OPEN_AS_UID flag and uid/gid different from root/root while libvirtd is running as root, we fork a new child, change its effective UID/GID to uid/gid and run virFileOpenAsNoFork. It doesn't make any sense to fchown() the opened file in this case since we already know that uid/gid can access the file when open succeeds and one of the following situations may happen: - the file is already owned by uid/gid and we skip fchown even before this patch - the file is owned by uid but not gid because it was created in a directory with SETGID set, in which case it is desirable not to change the group - the file may be owned by a completely different user and/or group because it was created on a root-squashed or even all-squashed NFS filesystem, in which case fchown would most likely fail anyway --- src/util/util.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 3d0ceea..8ff25da 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -652,7 +652,6 @@ virFileOpenAsNoFork(const char *path, int openflags, mode_t mode, { int fd = -1; int ret = 0; - struct stat st; if ((fd = open(path, openflags, mode)) < 0) { ret = -errno; @@ -660,18 +659,25 @@ virFileOpenAsNoFork(const char *path, int openflags, mode_t mode, path); goto error; } - if (fstat(fd, &st) == -1) { - ret = -errno; - virReportSystemError(errno, _("stat of '%s' failed"), path); - goto error; - } - if (((st.st_uid != uid) || (st.st_gid != gid)) - && (fchown(fd, uid, gid) < 0)) { - ret = -errno; - virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), - path, (unsigned int) uid, (unsigned int) gid); - goto error; + + /* VIR_FILE_OPEN_AS_UID in flags means we are running in a child process + * owned by uid and gid */ + if (!(flags & VIR_FILE_OPEN_AS_UID)) { + struct stat st; + if (fstat(fd, &st) == -1) { + ret = -errno; + virReportSystemError(errno, _("stat of '%s' failed"), path); + goto error; + } + if (((st.st_uid != uid) || (st.st_gid != gid)) + && (fchown(fd, uid, gid) < 0)) { + ret = -errno; + virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), + path, (unsigned int) uid, (unsigned int) gid); + goto error; + } } + if ((flags & VIR_FILE_OPEN_FORCE_PERMS) && (fchmod(fd, mode) < 0)) { ret = -errno; @@ -757,6 +763,7 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, if ((!(flags & VIR_FILE_OPEN_AS_UID)) || (getuid() != 0) || ((uid == 0) && (gid == 0))) { + flags &= ~VIR_FILE_OPEN_AS_UID; return virFileOpenAsNoFork(path, openflags, mode, uid, gid, flags); } -- 1.7.6

2 2

[libvirt] [PATCH] qemu: Don't chown files on NFS share if dynamic_ownership is off
by Michal Privoznik 08 Jul '11

08 Jul '11

When dynamic ownership is disabled we don't want to chown any files, not just local. --- src/qemu/qemu_driver.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 52b7dfd..968865f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2163,11 +2163,10 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom, is_reg = true; } else { is_reg = !!S_ISREG(sb.st_mode); - /* If the path is regular local file which exists + /* If the path is regular file which exists * already and dynamic_ownership is off, we don't * want to change it's ownership, just open it as-is */ - if (is_reg && !driver->dynamicOwnership && - virStorageFileIsSharedFS(path) == 0) { + if (is_reg && !driver->dynamicOwnership) { uid=sb.st_uid; gid=sb.st_gid; } -- 1.7.5.rc3

3 4

[libvirt] [PATCH 1/1] microblaze: Add architecture support
by John Williams 08 Jul '11

08 Jul '11

Add libvirt support for MicroBlaze architecture as a QEMU target. Based on mips/mipsel pattern. Signed-off-by: John Williams <john.williams(a)petalogix.com> --- docs/drvqemu.html.in | 2 ++ docs/schemas/capability.rng | 2 ++ examples/apparmor/libvirt-qemu | 4 ++++ src/qemu/qemu_capabilities.c | 2 ++ tests/capabilityschemadata/caps-qemu-kvm.xml | 24 ++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 0 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 7230cae..e0e44eb 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -16,6 +16,8 @@ <li> QEMU emulators: The driver will probe <code>/usr/bin</code> for the presence of <code>qemu</code>, <code>qemu-system-x86_64</code>, + <code>qemu-system-microblaze</code>, + <code>qemu-system-microblazeel</code>, <code>qemu-system-mips</code>,<code>qemu-system-mipsel</code>, <code>qemu-system-sparc</code>,<code>qemu-system-ppc</code>. The results of this can be seen from the capabilities XML output. diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index f894b09..99b4a9a 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -325,6 +325,8 @@ <value>arm</value> <value>i686</value> <value>ia64</value> + <value>microblaze</value> + <value>microblazeel</value> <value>mips</value> <value>mipsel</value> <value>ppc64</value> diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index faf8636..3251536 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -69,6 +69,8 @@ /usr/bin/qemu-system-cris rmix, /usr/bin/qemu-system-i386 rmix, /usr/bin/qemu-system-m68k rmix, + /usr/bin/qemu-system-microblaze rmix, + /usr/bin/qemu-system-microblazeel rmix, /usr/bin/qemu-system-mips rmix, /usr/bin/qemu-system-mips64 rmix, /usr/bin/qemu-system-mips64el rmix, @@ -87,6 +89,8 @@ /usr/bin/qemu-cris rmix, /usr/bin/qemu-i386 rmix, /usr/bin/qemu-m68k rmix, + /usr/bin/qemu-microblaze rmix, + /usr/bin/qemu-microblazeel rmix, /usr/bin/qemu-mips rmix, /usr/bin/qemu-mipsel rmix, /usr/bin/qemu-ppc rmix, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ad62a07..2c037ce 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -160,6 +160,8 @@ static const struct qemu_arch_info const arch_info_hvm[] = { { "x86_64", 64, NULL, "qemu-system-x86_64", NULL, arch_info_x86_64_flags, 2 }, { "arm", 32, NULL, "qemu-system-arm", NULL, NULL, 0 }, + { "microblaze", 32, NULL, "qemu-system-microblaze", NULL, NULL, 0 }, + { "microblazeel", 32, NULL, "qemu-system-microblazeel", NULL, NULL, 0 }, { "mips", 32, NULL, "qemu-system-mips", NULL, NULL, 0 }, { "mipsel", 32, NULL, "qemu-system-mipsel", NULL, NULL, 0 }, { "sparc", 32, NULL, "qemu-system-sparc", NULL, NULL, 0 }, diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index 47accde..dc6fb76 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -113,6 +113,30 @@ <guest> <os_type>hvm</os_type> + <arch name='microblaze'> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-microblaze</emulator> + <machine>petalogix-s3adsp1800</machine> + <machine>microblaze-fdt</machine> + <domain type='qemu'> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name='microblazeel'> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-microblazeel</emulator> + <machine>petalogix-s3adsp1800</machine> + <machine>microblaze-fdt</machine> + <domain type='qemu'> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> <arch name='mips'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-mips</emulator> -- 1.7.0.4

2 2

[libvirt] [PATCH] virsh: make destroy sound less scary
by Eric Blake 07 Jul '11

07 Jul '11

Destroy has a rather negative English connotation. Try to reduce the impact, so newbies aren't as scared to use it. * tools/virsh.c: Tweak all destroy documentation. * tools/virsh.pod: Likewise. --- tools/virsh.c | 20 +++++++++++--------- tools/virsh.pod | 16 +++++++++------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 9a189fd..3b6f0ff 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2264,8 +2264,9 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) * "destroy" command */ static const vshCmdInfo info_destroy[] = { - {"help", N_("destroy a domain")}, - {"desc", N_("Destroy a given domain.")}, + {"help", N_("destroy (stop) a domain")}, + {"desc", + N_("Forcefully stop a given domain, but leave its resources intact.")}, {NULL, NULL} }; @@ -4887,8 +4888,8 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) * "net-destroy" command */ static const vshCmdInfo info_network_destroy[] = { - {"help", N_("destroy a network")}, - {"desc", N_("Destroy a given network.")}, + {"help", N_("destroy (stop) a network")}, + {"desc", N_("Forcefully stop a given network.")}, {NULL, NULL} }; @@ -5734,7 +5735,7 @@ cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_interface_destroy[] = { {"help", N_("destroy a physical host interface (disable it / \"if-down\")")}, - {"desc", N_("destroy a physical host interface.")}, + {"desc", N_("forcefully stop a physical host interface.")}, {NULL, NULL} }; @@ -6293,9 +6294,9 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) * "nodedev-destroy" command */ static const vshCmdInfo info_node_device_destroy[] = { - {"help", N_("destroy a device on the node")}, + {"help", N_("destroy (stop) a device on the node")}, {"desc", N_("Destroy a device on the node. Note that this " - "command destroys devices on the physical host ")}, + "command destroys devices on the physical host")}, {NULL, NULL} }; @@ -6583,8 +6584,9 @@ cmdPoolBuild(vshControl *ctl, const vshCmd *cmd) * "pool-destroy" command */ static const vshCmdInfo info_pool_destroy[] = { - {"help", N_("destroy a pool")}, - {"desc", N_("Destroy a given pool.")}, + {"help", N_("destroy (stop) a pool")}, + {"desc", + N_("Forcefully stop a given pool. Raw data in the pool is untouched")}, {NULL, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 736b919..8b820d2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -405,7 +405,9 @@ but not started. Immediately terminate the domain domain-id. This doesn't give the domain OS any chance to react, and it's the equivalent of ripping the power cord out on a physical machine. In most cases you will want to use -the B<shutdown> command instead. +the B<shutdown> command instead. However, this does not delete any +storage volumes used by the guest, and if the domain is persistent, it +can be restarted later. =item B<domblkstat> I<domain> I<block-device> @@ -506,7 +508,7 @@ variables, and defaults to C<vi>. =item B<managedsave> I<domain-id> -Save and destroy a running domain, so it can be restarted from the same +Save and destroy (stop) a running domain, so it can be restarted from the same state at a later time. When the virsh B<start> command is next run for the domain, it will automatically be started from this saved state. @@ -957,8 +959,8 @@ not instantiated. =item B<net-destroy> I<network> -Destroy a given virtual network specified by its name or UUID. This takes -effect immediately. +Destroy (stop) a given virtual network specified by its name or UUID. This +takes effect immediately. =item B<net-dumpxml> I<network> @@ -1032,7 +1034,7 @@ not started. =item B<iface-destroy> I<interface> -Destroy a given host interface, such as by running "if-down" to +Destroy (stop) a given host interface, such as by running "if-down" to disable that interface from active use. This takes effect immediately. =item B<iface-dumpxml> I<interface> optional I<--inactive> @@ -1162,7 +1164,7 @@ I<type>. =item B<pool-destroy> I<pool-or-uuid> -Destroy a given I<pool> object. Libvirt will no longer manage the +Destroy (stop) a given I<pool> object. Libvirt will no longer manage the storage described by the pool object, but the raw data contained in the pool is not changed, and can be later recovered with B<pool-create>. @@ -1171,7 +1173,7 @@ B<pool-create>. Destroy the resources used by a given I<pool> object. This operation is non-recoverable. The I<pool> object will still exist after this -command. +command, ready for the creation of new storage volumes. =item B<pool-dumpxml> I<pool-or-uuid> -- 1.7.4.4

2 2

[libvirt] [PATCH] build: use gnulib pthread_sigmask
by Eric Blake 07 Jul '11

07 Jul '11

Gnulib finally learned how to do pthread_sigmask on mingw. We still have to worry about optional signals, like SIGWINCH, but overall, this makes for less conditional code. * .gnulib: Update to latest, for pthread_sigmask. * bootstrap.conf (gnulib_modules): Add pthread_sigmask. * configure.ac (AC_CHECK_FUNCS): Drop redundant check. * src/rpc/virnetclient.c (virNetClientSetTLSSession) (virNetClientIOEventLoop): Make code unconditional. * src/util/command.c (virFork): Likewise. * tools/virsh.c (doMigrate, cmdMigrate): Likewise. --- .gnulib | 2 +- bootstrap.conf | 1 + configure.ac | 2 +- src/rpc/virnetclient.c | 24 ++++++++---------------- src/util/command.c | 10 ---------- tools/virsh.c | 10 ---------- 6 files changed, 11 insertions(+), 38 deletions(-) diff --git a/.gnulib b/.gnulib index 8db4963..adc3a5b 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 8db49630deab35ffbce5c113aed093359a75091d +Subproject commit adc3a5b0083c935f5dcd408983e37c78cb8ebd7c diff --git a/bootstrap.conf b/bootstrap.conf index d3ff150..a800534 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -68,6 +68,7 @@ pipe2 poll posix-shell pthread +pthread_sigmask recv random_r sched diff --git a/configure.ac b/configure.ac index 13b4afb..aa589d6 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,7 @@ dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. dnl LIB_PTHREAD was set during gl_INIT by gnulib. old_LIBS=$LIBS LIBS="$LIBS $LIB_PTHREAD" -AC_CHECK_FUNCS([pthread_sigmask pthread_mutexattr_init]) +AC_CHECK_FUNCS([pthread_mutexattr_init]) LIBS=$old_libs dnl Availability of various common headers (non-fatal if missing). diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 615de6c..6a112ee 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -273,14 +273,16 @@ int virNetClientSetTLSSession(virNetClientPtr client, char buf[1]; int len; struct pollfd fds[1]; -#ifdef HAVE_PTHREAD_SIGMASK sigset_t oldmask, blockedsigs; sigemptyset (&blockedsigs); +#ifdef SIGWINCH sigaddset (&blockedsigs, SIGWINCH); +#endif +#ifdef SIGCHLD sigaddset (&blockedsigs, SIGCHLD); - sigaddset (&blockedsigs, SIGPIPE); #endif + sigaddset (&blockedsigs, SIGPIPE); virNetClientLock(client); @@ -311,18 +313,14 @@ int virNetClientSetTLSSession(virNetClientPtr client, * after the call (RHBZ#567931). Same for SIGCHLD and SIGPIPE * at the suggestion of Paolo Bonzini and Daniel Berrange. */ -#ifdef HAVE_PTHREAD_SIGMASK ignore_value(pthread_sigmask(SIG_BLOCK, &blockedsigs, &oldmask)); -#endif repoll: ret = poll(fds, ARRAY_CARDINALITY(fds), -1); if (ret < 0 && errno == EAGAIN) goto repoll; -#ifdef HAVE_PTHREAD_SIGMASK ignore_value(pthread_sigmask(SIG_BLOCK, &oldmask, NULL)); -#endif } ret = virNetTLSContextCheckCertificate(tls, client->tls); @@ -338,19 +336,15 @@ int virNetClientSetTLSSession(virNetClientPtr client, fds[0].revents = 0; fds[0].events = POLLIN; -#ifdef HAVE_PTHREAD_SIGMASK /* Block SIGWINCH from interrupting poll in curses programs */ ignore_value(pthread_sigmask(SIG_BLOCK, &blockedsigs, &oldmask)); -#endif repoll2: ret = poll(fds, ARRAY_CARDINALITY(fds), -1); if (ret < 0 && errno == EAGAIN) goto repoll2; -#ifdef HAVE_PTHREAD_SIGMASK ignore_value(pthread_sigmask(SIG_BLOCK, &oldmask, NULL)); -#endif len = virNetTLSSessionRead(client->tls, buf, 1); if (len < 0) { @@ -800,9 +794,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client, virNetClientCallPtr tmp = client->waitDispatch; virNetClientCallPtr prev; char ignore; -#ifdef HAVE_PTHREAD_SIGMASK sigset_t oldmask, blockedsigs; -#endif int timeout = -1; /* If we have existing SASL decoded data we @@ -841,22 +833,22 @@ static int virNetClientIOEventLoop(virNetClientPtr client, * after the call (RHBZ#567931). Same for SIGCHLD and SIGPIPE * at the suggestion of Paolo Bonzini and Daniel Berrange. */ -#ifdef HAVE_PTHREAD_SIGMASK sigemptyset (&blockedsigs); +#ifdef SIGWINCH sigaddset (&blockedsigs, SIGWINCH); +#endif +#ifdef SIGCHLD sigaddset (&blockedsigs, SIGCHLD); +#endif sigaddset (&blockedsigs, SIGPIPE); ignore_value(pthread_sigmask(SIG_BLOCK, &blockedsigs, &oldmask)); -#endif repoll: ret = poll(fds, ARRAY_CARDINALITY(fds), timeout); if (ret < 0 && errno == EAGAIN) goto repoll; -#ifdef HAVE_PTHREAD_SIGMASK ignore_value(pthread_sigmask(SIG_SETMASK, &oldmask, NULL)); -#endif virNetClientLock(client); diff --git a/src/util/command.c b/src/util/command.c index 9fdeb0b..eae58b2 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -145,9 +145,7 @@ static int virClearCapabilities(void) */ int virFork(pid_t *pid) { -# ifdef HAVE_PTHREAD_SIGMASK sigset_t oldmask, newmask; -# endif struct sigaction sig_action; int saved_errno, ret = -1; @@ -157,7 +155,6 @@ int virFork(pid_t *pid) { * Need to block signals now, so that child process can safely * kill off caller's signal handlers without a race. */ -# ifdef HAVE_PTHREAD_SIGMASK sigfillset(&newmask); if (pthread_sigmask(SIG_SETMASK, &newmask, &oldmask) != 0) { saved_errno = errno; @@ -165,7 +162,6 @@ int virFork(pid_t *pid) { "%s", _("cannot block signals")); goto cleanup; } -# endif /* Ensure we hold the logging lock, to protect child processes * from deadlocking on another thread's inherited mutex state */ @@ -178,11 +174,9 @@ int virFork(pid_t *pid) { virLogUnlock(); if (*pid < 0) { -# ifdef HAVE_PTHREAD_SIGMASK /* attempt to restore signal mask, but ignore failure, to avoid obscuring the fork failure */ ignore_value (pthread_sigmask(SIG_SETMASK, &oldmask, NULL)); -# endif virReportSystemError(saved_errno, "%s", _("cannot fork child process")); goto cleanup; @@ -192,7 +186,6 @@ int virFork(pid_t *pid) { /* parent process */ -# ifdef HAVE_PTHREAD_SIGMASK /* Restore our original signal mask now that the child is safely running */ if (pthread_sigmask(SIG_SETMASK, &oldmask, NULL) != 0) { @@ -200,7 +193,6 @@ int virFork(pid_t *pid) { virReportSystemError(errno, "%s", _("cannot unblock signals")); goto cleanup; } -# endif ret = 0; } else { @@ -237,7 +229,6 @@ int virFork(pid_t *pid) { sigaction(i, &sig_action, NULL); } -# ifdef HAVE_PTHREAD_SIGMASK /* Unmask all signals in child, since we've no idea what the caller's done with their signal mask and don't want to propagate that to children */ @@ -247,7 +238,6 @@ int virFork(pid_t *pid) { virReportSystemError(errno, "%s", _("cannot unblock signals")); goto cleanup; } -# endif ret = 0; } diff --git a/tools/virsh.c b/tools/virsh.c index 9a189fd..2e776ec 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -4400,14 +4400,12 @@ doMigrate (void *opaque) const vshCmd *cmd = data->cmd; const char *xmlfile = NULL; char *xml = NULL; -#if HAVE_PTHREAD_SIGMASK sigset_t sigmask, oldsigmask; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0) goto out_sig; -#endif if (!vshConnectionUsability (ctl, ctl->conn)) goto out; @@ -4483,10 +4481,8 @@ doMigrate (void *opaque) } out: -#if HAVE_PTHREAD_SIGMASK pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: -#endif if (dom) virDomainFree (dom); VIR_FREE(xml); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); @@ -4534,12 +4530,10 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) struct timeval start, curr; bool live_flag = false; vshCtrlData data; -#if HAVE_PTHREAD_SIGMASK sigset_t sigmask, oldsigmask; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -#endif if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -4631,13 +4625,9 @@ repoll: } if (verbose) { -#if HAVE_PTHREAD_SIGMASK pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask); -#endif ret = virDomainGetJobInfo(dom, &jobinfo); -#if HAVE_PTHREAD_SIGMASK pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); -#endif if (ret == 0) print_job_progress(jobinfo.dataRemaining, jobinfo.dataTotal); } -- 1.7.4.4

2 2

[libvirt] [PATCHv3] build: fix virBufferVasprintf on mingw
by Eric Blake 07 Jul '11

07 Jul '11

Gnulib documents that mingw vsnprintf is broken (it returns -1 on out-of-space, instead of the count of what would have been printed); but while we were using the snprintf wrapper, we had not yet been using the vsnprintf wrapper. Meanwhile, mingw (but not mingw64) has a replacement snprintf that fixes return values, but still lacks %1$s support; so in that case, gnulib didn't replace snprintf, but libintl then went ahead and installed a version that supported %1$s but not return values. Gnulib has since been fixed to guarantee that the snprintf module will always guarantee the constraints needed by libintl. Also, we want to guarantee that strdup sets errno on failure. * .gnulib: Update to latest, for vsnprintf fix. * bootstrap.conf (gnulib_modules): Add vsnprintf, strdup-posix. Reported by Matthias Bolte. --- v3: more gnulib updates, also fix strdup v2: see https://www.redhat.com/archives/libvir-list/2011-July/msg00042.html * .gnulib 7269b35...8db4963 (23): > sys_select: define sigset_t more portably > * m4/sys_select_h.m4 (gl_HEADER_SYS_SELECT): Poison pselect. > pselect: Use pthread_sigmask, not sigprocmask. > modules/pselect: Add Bruno and Jim to maintainers. > * modules/pselect: Add select, LIBSOCKET. > * lib/pselect.c (pselect): Use plain name, without "rpl_". > pselect: document better > pthread_sigmask: new module > test-pselect: new module > * tests/test-sys_select.c (sigset_t): Test for it, too. > snprintf: guarantee %1$d, for libintl > maint: exempt stdio-read.c and stdio-write.c from the cppi check > maint: indent with spaces, not TABs, and add a rule to check this > maint.mk: correct omissions in prohibit_argmatch_without_use check > Comments about EINTR. > autoupdate > xnanosleep: Rewrite to use new dtotimespec module. > timespec-add, timespec-sub: new modules > dtotimespec: new module > * lib/timespec.h (timespectod): New inline function. > * lib/timespec.h (timespec_sign): New inline function. > pselect: new module > sys_select: don't depend on sys_socket I'm also investigating how easy it would be to use gnulib's new pthread_sigmask. .gnulib | 2 +- bootstrap.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 7269b35..8db4963 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 7269b35c8d9be1a6f97906b9e29b8c422b92fc31 +Subproject commit 8db49630deab35ffbce5c113aed093359a75091d diff --git a/bootstrap.conf b/bootstrap.conf index 581d60b..d3ff150 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -80,6 +80,7 @@ socket stdarg stpcpy strchrnul +strdup-posix strndup strerror strerror_r-posix @@ -97,6 +98,7 @@ usleep vasprintf verify vc-list-files +vsnprintf waitpid warnings ' -- 1.7.4.4

2 1

[libvirt] [PATCH] Fix compilation of statstest.c during make check
by Jim Fehlig 07 Jul '11

07 Jul '11

--- tests/statstest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/statstest.c b/tests/statstest.c index d18bb0c..c989992 100644 --- a/tests/statstest.c +++ b/tests/statstest.c @@ -17,7 +17,7 @@ static void testQuietError(void *userData ATTRIBUTE_UNUSED, static int testDevice(const char *path, int expect) { - int actual = xenLinuxDomainDeviceID(NULL, 1, path); + int actual = xenLinuxDomainDeviceID(1, path); if (actual == expect) { return 0; -- 1.7.5.4

2 3

[libvirt] [PATCH] Do not drop kernel cmdline for xen pv domains
by Jim Fehlig 07 Jul '11

07 Jul '11

Kernel cmdline args can be passed to xen pv domains even when a bootloader is specified. The current config-to-sxpr mapping ignores cmdline when bootloader is present. Since the xend sub-driver is used with many xen toolstack versions, this patch takes conservative approach of adding an else block to existing !def->os.bootloader, and only appends sxpr if def->os.cmdline is non-NULL. --- src/xenxs/xen_sxpr.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 13ca015..bd770bc 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -2261,6 +2261,12 @@ xenFormatSxpr(virConnectPtr conn, } virBufferAddLit(&buf, "))"); + } else { + /* PV domains accept kernel cmdline args */ + if (def->os.cmdline) { + virBufferEscapeSexpr(&buf, "(image (linux (args '%s')))", + def->os.cmdline); + } } for (i = 0 ; i < def->ndisks ; i++) -- 1.7.5.4

3 4

[libvirt] [PATCH] Skip bugs which are CLOSED in todo list
by Daniel P. Berrange 07 Jul '11

07 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> * docs/todo.pl: Skip closed bugs --- docs/todo.pl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/todo.pl b/docs/todo.pl index e6da418..1183ff5 100755 --- a/docs/todo.pl +++ b/docs/todo.pl @@ -47,6 +47,8 @@ my $trackers = BZ::Client::Bug->search($client, {'product' => $product, my @trackers; foreach my $tracker (@{$trackers}) { + next if $tracker->{'bug_status'} eq "CLOSED"; + my $summary = $tracker->{'short_desc'}; $summary =~ s/^\s*RFE\s*:\s*//; $summary =~ s/^\s*\[\s*RFE\s*\]\s*:?\s*//; @@ -64,6 +66,8 @@ foreach my $tracker (@trackers) { 'blocked' => $tracker->{id}}); foreach my $feature (@{$features}) { + next if $feature->{'bug_status'} eq "CLOSED"; + my $summary = $feature->{'short_desc'}; $summary =~ s/^\s*RFE\s*:\s*//; $summary =~ s/^\s*\[\s*RFE\s*\]\s*:?\s*//; -- 1.7.6

2 1

[libvirt] Fwd: Re: ports/devel/libvirt Makefile distinfo ports/devel/libvirt/files patch-docs__apibuild.py patch-libvirtd.h
by Jason Helfman 07 Jul '11

07 Jul '11

Hey Guys, Any ideas on this one? I have no way to test this, at the moment. Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

2 1

[libvirt] [PATCH] Remove duplicate empty lines and correct indentation and style
by Matthias Bolte 07 Jul '11

07 Jul '11

No functional change included. --- python/libvirt-override.c | 1 - src/conf/domain_conf.c | 1 - src/conf/interface_conf.c | 1 - src/conf/network_conf.c | 1 - src/conf/node_device_conf.c | 4 - src/conf/storage_conf.c | 1 - src/interface/netcf_driver.c | 16 ++---- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/node_device/node_device_driver.c | 2 - src/node_device/node_device_linux_sysfs.c | 2 - src/nwfilter/nwfilter_ebiptables_driver.c | 2 - src/openvz/openvz_driver.c | 87 ++++++++++++++--------------- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 10 +-- src/qemu/qemu_process.c | 1 - src/rpc/virnetclient.c | 2 - src/rpc/virnetserverservice.c | 2 - src/uml/uml_driver.c | 2 - src/xen/xen_driver.c | 1 - src/xen/xs_internal.c | 12 ++-- src/xenxs/xen_xm.c | 1 - tests/virnetsockettest.c | 3 - 24 files changed, 60 insertions(+), 100 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 2b88796..64d793d 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2572,7 +2572,6 @@ libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, ret = 0; } - cleanup: LIBVIRT_RELEASE_THREAD_STATE; return ret; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7bcdcaf..83930c1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9806,7 +9806,6 @@ char *virDomainDefFormat(virDomainDefPtr def, if (virDomainFSDefFormat(&buf, def->fss[n], flags) < 0) goto cleanup; - for (n = 0 ; n < def->nnets ; n++) if (virDomainNetDefFormat(&buf, def->nets[n], flags) < 0) goto cleanup; diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 10377e7..99c3052 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -1300,7 +1300,6 @@ virInterfaceObjPtr virInterfaceAssignDef(virInterfaceObjListPtr interfaces, interfaces->count++; return iface; - } void virInterfaceRemove(virInterfaceObjListPtr interfaces, diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index ae479bf..3aeec7e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1155,7 +1155,6 @@ int virNetworkSaveXML(const char *configDir, cleanup: VIR_FORCE_CLOSE(fd); - VIR_FREE(configFile); return ret; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index dde2921..1ea122e 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -746,11 +746,8 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt, } if (STREQ(type, "vport_ops")) { - data->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS; - } else if (STREQ(type, "fc_host")) { - xmlNodePtr orignode2; data->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST; @@ -775,7 +772,6 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt, } ctxt->node = orignode2; - } else { virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, _("unknown SCSI host capability type '%s' for '%s'"), diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f6f8be1..21d39a8 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1203,7 +1203,6 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAsprintf(buf," <group>%d</group>\n", def->perms.gid); - if (def->perms.label) virBufferAsprintf(buf," <label>%s</label>\n", def->perms.label); diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index dd15c9d..5a549db 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -125,22 +125,19 @@ static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, { struct interface_driver *driverState; - if (VIR_ALLOC(driverState) < 0) - { + if (VIR_ALLOC(driverState) < 0) { virReportOOMError(); goto alloc_error; } /* initialize non-0 stuff in driverState */ - if (virMutexInit(&driverState->lock) < 0) - { + if (virMutexInit(&driverState->lock) < 0) { /* what error to report? */ goto mutex_error; } /* open netcf */ - if (ncf_init(&driverState->netcf, NULL) != 0) - { + if (ncf_init(&driverState->netcf, NULL) != 0) { /* what error to report? */ goto netcf_error; } @@ -149,8 +146,7 @@ static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; netcf_error: - if (driverState->netcf) - { + if (driverState->netcf) { ncf_close(driverState->netcf); } virMutexDestroy (&driverState->lock); @@ -162,9 +158,7 @@ alloc_error: static int interfaceCloseInterface(virConnectPtr conn) { - - if (conn->interfacePrivateData != NULL) - { + if (conn->interfacePrivateData != NULL) { struct interface_driver *driver = conn->interfacePrivateData; /* close netcf instance */ diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ade69d8..4926398 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2671,7 +2671,7 @@ libxlDomainDefineXML(virConnectPtr conn, const char *xml) VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - if ((dupVM = virDomainObjIsDuplicate(&driver->domains, def, 0)) < 0) + if ((dupVM = virDomainObjIsDuplicate(&driver->domains, def, 0)) < 0) goto cleanup; if (!(vm = virDomainAssignDef(driver->caps, diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ffcfe4d..2b1585b 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -412,7 +412,7 @@ static virDomainPtr lxcDomainDefine(virConnectPtr conn, const char *xml) VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - if ((dupVM = virDomainObjIsDuplicate(&driver->domains, def, 0)) < 0) + if ((dupVM = virDomainObjIsDuplicate(&driver->domains, def, 0)) < 0) goto cleanup; if ((def->nets != NULL) && !(driver->have_netns)) { diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 842f903..62ceee7 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -220,13 +220,11 @@ nodeDeviceLookupByWWN(virConnectPtr conn, nodeDeviceLock(driver); for (i = 0; i < devs->count; i++) { - obj = devs->objs[i]; virNodeDeviceObjLock(obj); cap = obj->def->caps; while (cap) { - if (cap->type == VIR_NODE_DEV_CAP_SCSI_HOST) { check_fc_host(&cap->data); if (cap->data.scsi_host.flags & diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 34e4501..eab5158 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -270,13 +270,11 @@ static int get_sriov_function(const char *device_link, device_link); if (!virFileExists(device_link)) { - VIR_DEBUG("SR IOV function link '%s' does not exist", device_link); /* Not an SR IOV device, not an error, either. */ ret = SRIOV_NOT_FOUND; goto out; - } device_path = canonicalize_file_name (device_link); diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index c9b60da..7321c2a 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -922,7 +922,6 @@ iptablesHandleIpHdr(virBufferPtr buf, ipaddr); if (HAS_ENTRY_ITEM(&ipHdr->dataSrcIPTo)) { - if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataSrcIPTo)) @@ -1584,7 +1583,6 @@ _iptablesCreateRuleInstance(int directionIn, } else final = &buf; - return ebiptablesAddRuleInst(res, virBufferContentAndReset(final), nwfilter->chainsuffix, diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index c13f346..d62b91f 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -177,18 +177,14 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) if (vmdef->nfss == 1 && vmdef->fss[0]->type != VIR_DOMAIN_FS_TYPE_TEMPLATE && - vmdef->fss[0]->type != VIR_DOMAIN_FS_TYPE_MOUNT) - { + vmdef->fss[0]->type != VIR_DOMAIN_FS_TYPE_MOUNT) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("filesystem is not of type 'template' or 'mount'")); goto cleanup; } - if (vmdef->nfss == 1 && - vmdef->fss[0]->type == VIR_DOMAIN_FS_TYPE_MOUNT) - { - + vmdef->fss[0]->type == VIR_DOMAIN_FS_TYPE_MOUNT) { if (virStrToLong_i(vmdef->name, NULL, 10, &vpsid) < 0) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not convert domain name to VEID")); @@ -206,9 +202,7 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) _("Could not set the source dir for the filesystem")); goto cleanup; } - } - else - { + } else { if (openvzDomainDefineCmd(prog, OPENVZ_MAX_ARG, vmdef) < 0) { VIR_ERROR(_("Error creating command for container")); goto cleanup; @@ -222,9 +216,9 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) ret = 0; cleanup: - VIR_FREE(confdir); - cmdExecFree(prog); - return ret; + VIR_FREE(confdir); + cmdExecFree(prog); + return ret; } @@ -537,42 +531,43 @@ cleanup: return ret; } -static int openvzDomainResume(virDomainPtr dom) { - struct openvz_driver *driver = dom->conn->privateData; - virDomainObjPtr vm; - const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINAL, "--resume", NULL}; - int ret = -1; - - openvzDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, dom->uuid); - openvzDriverUnlock(driver); - - if (!vm) { - openvzError(VIR_ERR_NO_DOMAIN, "%s", - _("no domain with matching uuid")); - goto cleanup; - } - - if (!virDomainObjIsActive(vm)) { - openvzError(VIR_ERR_OPERATION_INVALID, "%s", - _("Domain is not running")); - goto cleanup; - } - - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { - openvzSetProgramSentinal(prog, vm->def->name); - if (virRun(prog, NULL) < 0) { - goto cleanup; - } - virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); - } - - ret = 0; +static int openvzDomainResume(virDomainPtr dom) +{ + struct openvz_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINAL, "--resume", NULL}; + int ret = -1; + + openvzDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + openvzError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + openvzError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not running")); + goto cleanup; + } + + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { + openvzSetProgramSentinal(prog, vm->def->name); + if (virRun(prog, NULL) < 0) { + goto cleanup; + } + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); + } + + ret = 0; cleanup: - if (vm) - virDomainObjUnlock(vm); - return ret; + if (vm) + virDomainObjUnlock(vm); + return ret; } static int openvzDomainShutdown(virDomainPtr dom) { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ad62a07..778def4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1025,7 +1025,7 @@ qemuCapsComputeCmdFlags(const char *help, * two features. The benefits of JSON mode now outweigh * the downside. */ - if (version >= 13000) + if (version >= 13000) qemuCapsSet(flags, QEMU_CAPS_MONITOR_JSON); if (version >= 13000) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6e4480e..b47368c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -662,7 +662,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virBitmapPtr qemuCaps) return 0; - no_memory: +no_memory: virReportOOMError(); return -1; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 52b7dfd..2301424 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8027,8 +8027,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); - } - else { + } else { /* qemu is a little funny with running guests and the restoration * of snapshots. If the snapshot was taken online, * then after a "loadvm" monitor command, the VM is set running @@ -8113,8 +8112,7 @@ static int qemuDomainSnapshotDiscard(struct qemud_driver *driver, } } } - } - else { + } else { priv = vm->privateData; qemuDomainObjEnterMonitorWithDriver(driver, vm); /* we continue on even in the face of error */ @@ -8135,9 +8133,9 @@ static int qemuDomainSnapshotDiscard(struct qemud_driver *driver, /* Now we set the new current_snapshot for the domain */ vm->current_snapshot = parentsnap; - } - else + } else { vm->current_snapshot = NULL; + } } if (virAsprintf(&snapFile, "%s/%s/%s.xml", driver->snapshotDir, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c9145cb..cdb0193 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -819,7 +819,6 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjExitMonitorWithDriver(driver, vm); error: - return ret; } diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 615de6c..e3217ac 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -936,7 +936,6 @@ static int virNetClientIOEventLoop(virNetClientPtr client, return 0; } - if (fds[0].revents & (POLLHUP | POLLERR)) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("received hangup / error event on socket")); @@ -944,7 +943,6 @@ static int virNetClientIOEventLoop(virNetClientPtr client, } } - error: client->waitDispatch = thiscall->next; VIR_DEBUG("Giving up the buck due to I/O error %p %p", thiscall, client->waitDispatch); diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 8c250e2..dae172c 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -131,7 +131,6 @@ virNetServerServicePtr virNetServerServiceNewTCP(const char *nodename, goto error; } - return svc; no_memory: @@ -187,7 +186,6 @@ virNetServerServicePtr virNetServerServiceNewUNIX(const char *path, goto error; } - return svc; no_memory: diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index f0f053b..2fb31cb 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1762,7 +1762,6 @@ static int umlDomainAttachUmlDisk(struct uml_driver *driver, return 0; error: - VIR_FREE(reply); VIR_FREE(cmd); @@ -1818,7 +1817,6 @@ static int umlDomainAttachDevice(virDomainPtr dom, const char *xml) } cleanup: - virDomainDeviceDefFree(dev); if (vm) virDomainObjUnlock(vm); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 88febba..af83e8e 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -347,7 +347,6 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) priv->xendConfigVersion = -1; priv->xshandle = NULL; - /* Hypervisor is only run with privilege & required to succeed */ if (xenHavePrivilege()) { VIR_DEBUG("Trying hypervisor sub-driver"); diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 04bf93a..e7aaf60 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -1333,7 +1333,7 @@ retry: if (new_domain_cnt < 0) return -1; - if( VIR_ALLOC_N(new_domids,new_domain_cnt) < 0 ) { + if (VIR_ALLOC_N(new_domids, new_domain_cnt) < 0) { virReportOOMError(); return -1; } @@ -1345,9 +1345,9 @@ retry: } missing = 0; - for (i=0 ; i < new_domain_cnt ; i++) { + for (i = 0; i < new_domain_cnt; i++) { found = 0; - for (j = 0 ; j < priv->activeDomainList->count ; j++) { + for (j = 0; j < priv->activeDomainList->count; j++) { if (priv->activeDomainList->doms[j]->id == new_domids[i]) { found = 1; break; @@ -1416,7 +1416,7 @@ retry: if (new_domain_cnt < 0) return -1; - if( VIR_ALLOC_N(new_domids,new_domain_cnt) < 0 ) { + if (VIR_ALLOC_N(new_domids, new_domain_cnt) < 0 ) { virReportOOMError(); return -1; } @@ -1428,9 +1428,9 @@ retry: } removed = 0; - for (j=0 ; j < priv->activeDomainList->count ; j++) { + for (j = 0; j < priv->activeDomainList->count; j++) { found = 0; - for (i=0 ; i < new_domain_cnt ; i++) { + for (i = 0; i < new_domain_cnt; i++) { if (priv->activeDomainList->doms[j]->id == new_domids[i]) { found = 1; break; diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 0ad2179..511d1f5 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -1426,7 +1426,6 @@ virConfPtr xenFormatXM(virConnectPtr conn, if (!(conf = virConfNew())) goto cleanup; - if (xenXMConfigSetString(conf, "name", def->name) < 0) goto no_memory; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index f6c7274..34b1df7 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -292,13 +292,11 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED) goto cleanup; } - if (virNetSocketAccept(lsock, &ssock) < 0) { VIR_DEBUG("Unexpected client socket missing"); goto cleanup; } - if (STRNEQ(virNetSocketLocalAddrString(ssock), "127.0.0.1;0")) { VIR_DEBUG("Unexpected local address"); goto cleanup; @@ -309,7 +307,6 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED) goto cleanup; } - ret = 0; cleanup: -- 1.7.4.1

3 3

[libvirt] [PATCH] python: Fix bogus label placement
by Matthias Bolte 07 Jul '11

07 Jul '11

--- python/libvirt-override.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 8be9af7..2b88796 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1489,13 +1489,12 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg return(NULL); if ((startCell < 0) || (maxCells <= 0) || (startCell + maxCells > 10000)) - goto error; + return VIR_PY_NONE; conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - freeMems = - malloc(maxCells * sizeof(*freeMems)); + freeMems = malloc(maxCells * sizeof(*freeMems)); if (freeMems == NULL) - goto error; + return VIR_PY_NONE; LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetCellsFreeMemory(conn, freeMems, startCell, maxCells); @@ -1503,7 +1502,6 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg if (c_retval < 0) { free(freeMems); -error: return VIR_PY_NONE; } py_retval = PyList_New(c_retval); -- 1.7.4.1

2 2

[libvirt] [PATCH] docs: minor whitespace cleanups
by Eric Blake 07 Jul '11

07 Jul '11

No change in wording. One spacing change in a <pre>, noticed because of odd XML formatting online; the rest is in free-flowing text to make it easier to see nesting levels in the document. * docs/formatdomain.html.in: Adjust spacing. Break long lines. --- I'll probably push this under the trivial rule. The <pre> change is in the hunk at line 296, for <numatune>. docs/formatdomain.html.in | 195 ++++++++++++++++++++++++++------------------- 1 files changed, 112 insertions(+), 83 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fe8d74c..10d87a9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -46,7 +46,8 @@ <dt><code>uuid</code></dt> <dd>The content of the <code>uuid</code> element provides a globally unique identifier for the virtual machine. - The format must be RFC 4122 compliant, eg <code>3e3fce45-4f53-4fa7-bb32-11f34168b82b</code>. + The format must be RFC 4122 compliant, + eg <code>3e3fce45-4f53-4fa7-bb32-11f34168b82b</code>. If omitted when defining/creating a new machine, a random UUID is generated. It is also possible to provide the UUID via a <a href="#elementsSysinfo"><code>sysinfo</code></a> @@ -96,13 +97,16 @@ on bare metal, so requires full virtualization. <code>linux</code> (badly named!) refers to an OS that supports the Xen 3 hypervisor guest ABI. There are also two optional attributes, <code>arch</code> - specifying the CPU architecture to virtualization, and <code>machine</code> - referring to the machine type. The <a href="formatcaps.html">Capabilities XML</a> - provides details on allowed values for these. Since 0.0.1</dd> + specifying the CPU architecture to virtualization, + and <code>machine</code> referring to the machine + type. The <a href="formatcaps.html">Capabilities XML</a> + provides details on allowed values for + these. Since 0.0.1</dd> <dt><code>loader</code></dt> <dd>The optional <code>loader</code> tag refers to a firmware blob used to assist the domain creation process. At this time, it is - only needed by Xen fully virtualized domains. Since 0.1.0</dd> + only needed by Xen fully virtualized + domains. Since 0.1.0</dd> <dt><code>boot</code></dt> <dd>The <code>dev</code> attribute takes one of the values "fd", "hd", "cdrom" or "network" and is used to specify the next boot device @@ -296,7 +300,7 @@ <shares>2048</shares> </cputune> <numatune> - <memory mode="strict" nodeset="1-4,^3"/> + <memory mode="strict" nodeset="1-4,^3"/> </numatune> ...</pre> @@ -372,7 +376,8 @@ physical CPUS the domain VCPU will be pinned to. If this is ommited, each VCPU pinned to all the physical CPUS by default. It contains two required attributes, the attribute <code>vcpu</code> specifies vcpu id, - and the attribute <code>cpuset</code> is same as attribute <code>cpuset</code> + and the attribute <code>cpuset</code> is same as + attribute <code>cpuset</code> of element <code>vcpu</code>. (NB: Only qemu driver support) Since 0.9.0 </dd> @@ -380,8 +385,9 @@ <dd> The optional <code>shares</code> element specifies the proportional weighted share for the domain. If this is ommited, it defaults to - the OS provided defaults. NB, There is no unit for the value, it's a relative - measure based on the setting of other VM, e.g. A VM configured with value + the OS provided defaults. NB, There is no unit for the value, + it's a relative measure based on the setting of other VM, + e.g. A VM configured with value 2048 will get twice as much CPU time as a VM configured with value 1024. Since 0.9.0 </dd> @@ -395,7 +401,8 @@ <dd> The optional <code>memory</code> element specify how to allocate memory for the domain process on a NUMA host. It contains two attributes, - attribute <code>mode</code> is either 'interleave', 'strict', or 'preferred', + attribute <code>mode</code> is either 'interleave', 'strict', + or 'preferred', attribute <code>nodeset</code> specifies the NUMA nodes, it leads same syntax with attribute <code>cpuset</code> of element <code>vcpu</code>. Since 0.9.3 @@ -825,12 +832,14 @@ to connect. Since 0.0.3</dd> <dt><code>target</code></dt> - <dd>The <code>target</code> element controls the bus / device under which the - disk is exposed to the guest OS. The <code>dev</code> attribute indicates - the "logical" device name. The actual device name specified is not guaranteed to map to - the device name in the guest OS. Treat it as a device ordering hint. - The optional <code>bus</code> attribute specifies the type of disk device - to emulate; possible values are driver specific, with typical values being + <dd>The <code>target</code> element controls the bus / device + under which the disk is exposed to the guest + OS. The <code>dev</code> attribute indicates the "logical" + device name. The actual device name specified is not + guaranteed to map to the device name in the guest OS. Treat it + as a device ordering hint. The optional <code>bus</code> + attribute specifies the type of disk device to emulate; + possible values are driver specific, with typical values being "ide", "scsi", "virtio", "xen" or "usb". If omitted, the bus type is inferred from the style of the device name. eg, a device named 'sda' will typically be exported using a SCSI bus. @@ -905,7 +914,8 @@ </dd> <dt><code>serial</code></dt> <dd>If present, this specify serial number of virtual hard drive. - For example, it may look as <code><serial>WD-WMAP9A966149</serial></code>. + For example, it may look + like <code><serial>WD-WMAP9A966149</serial></code>. Since 0.7.1 </dd> <dt><code>host</code></dt> @@ -1146,7 +1156,8 @@ <h4><a name="elementsUSB">USB and PCI devices</a></h4> - USB and PCI devices attached to the host can be passed through to the guest using + USB and PCI devices attached to the host can be passed through + to the guest using the <code>hostdev</code> element. since after 0.4.4 for USB and 0.6.0 for PCI (KVM only): @@ -1774,12 +1785,12 @@ qemu-kvm -net nic,model=? /dev/null ...</pre> - If no target is specified, certain hypervisors will automatically - generate a name for the created tun device. This name can be manually - specifed, however the name must not start with either 'vnet' or - 'vif', which are prefixes reserved by libvirt and certain - hypervisors. Manually specified targets using these prefixes will be - ignored. + If no target is specified, certain hypervisors will + automatically generate a name for the created tun device. This + name can be manually specifed, however the name must not + start with either 'vnet' or 'vif', which are prefixes + reserved by libvirt and certain hypervisors. Manually specified + targets using these prefixes will be ignored. <h5><a name="elementsNICSBoot">Specifying boot order</a></h5> @@ -1808,9 +1819,10 @@ qemu-kvm -net nic,model=? /dev/null <h4><a name="elementsInput">Input devices</a></h4> - Input devices allow interaction with the graphical framebuffer in the guest - virtual machine. When enabling the framebuffer, an input device is automatically - provided. It may be possible to add additional devices explicitly, for example, + Input devices allow interaction with the graphical framebuffer + in the guest virtual machine. When enabling the framebuffer, an + input device is automatically provided. It may be possible to + add additional devices explicitly, for example, to provide a graphics tablet for absolute cursor movement. @@ -1823,8 +1835,9 @@ qemu-kvm -net nic,model=? /dev/null <dl> <dt><code>input</code></dt> - <dd>The <code>input</code> element has one mandatory attribute, the <code>type</code> - whose value can be either 'mouse' or 'tablet'. The latter provides absolute + <dd>The <code>input</code> element has one mandatory attribute, + the <code>type</code> whose value can be either 'mouse' or + 'tablet'. The latter provides absolute cursor movement, while the former uses relative movement. The optional <code>bus</code> attribute can be used to refine the exact device type. It takes values "xen" (paravirtualized), "ps2" and "usb".</dd> @@ -1858,56 +1871,67 @@ qemu-kvm -net nic,model=? /dev/null <dl> <dt><code>graphics</code></dt> <dd>The <code>graphics</code> element has a mandatory <code>type</code> - attribute which takes the value "sdl", "vnc", "rdp" or "desktop": + attribute which takes the value "sdl", "vnc", "rdp" or "desktop": <dl> <dt><code>"sdl"</code></dt> <dd> - This displays a window on the host desktop, it can take 3 optional arguments: - a <code>display</code> attribute for the display to use, an <code>xauth</code> - attribute for the authentication identifier, and an optional <code>fullscreen</code> - attribute accepting values 'yes' or 'no'. + This displays a window on the host desktop, it can take 3 + optional arguments: a <code>display</code> attribute for + the display to use, an <code>xauth</code> attribute for + the authentication identifier, and an + optional <code>fullscreen</code> attribute accepting + values 'yes' or 'no'. </dd> <dt><code>"vnc"</code></dt> <dd> - Starts a VNC server. The <code>port</code> attribute specifies the TCP - port number (with -1 as legacy syntax indicating that it should be - auto-allocated). The <code>autoport</code> attribute is the new - preferred syntax for indicating autoallocation of the TCP port to use. - The <code>listen</code> attribute is an IP address for the server to - listen on. The <code>passwd</code> attribute provides a VNC password - in clear text. The <code>keymap</code> attribute specifies the keymap - to use. It is possible to set a limit on the validity of the password - be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. - - Rather than using listen/port, QEMU supports a <code>socket</code> - attribute for listening on a unix domain socket path. - Since 0.8.8 + Starts a VNC server. The <code>port</code> attribute + specifies the TCP port number (with -1 as legacy syntax + indicating that it should be + auto-allocated). The <code>autoport</code> attribute is + the new preferred syntax for indicating autoallocation of + the TCP port to use. The <code>listen</code> attribute is + an IP address for the server to listen + on. The <code>passwd</code> attribute provides a VNC + password in clear text. The <code>keymap</code> attribute + specifies the keymap to use. It is possible to set a limit + on the validity of the password be giving an + timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> + assumed to be in UTC. NB, this may not be supported by all + hypervisors. Rather than using listen/port, + QEMU supports a <code>socket</code> attribute for + listening on a unix domain socket + path.Since 0.8.8 </dd> <dt><code>"spice"</code></dt> <dd> - Starts a SPICE server. The <code>port</code> attribute specifies the TCP - port number (with -1 as legacy syntax indicating that it should be - auto-allocated), while <code>tlsPort</code> gives an alternative - secure port number. The <code>autoport</code> attribute is the new - preferred syntax for indicating autoallocation of both port numbers. - The <code>listen</code> attribute is an IP address for the server to - listen on. The <code>passwd</code> attribute provides a SPICE password - in clear text. The <code>keymap</code> attribute specifies the keymap - to use. It is possible to set a limit on the validity of the password - be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors. - "spice" since 0.8.6. + Starts a SPICE server. The <code>port</code> attribute + specifies the TCP port number (with -1 as legacy syntax + indicating that it should be auto-allocated), + while <code>tlsPort</code> gives an alternative secure + port number. The <code>autoport</code> attribute is the + new preferred syntax for indicating autoallocation of + both port numbers. The <code>listen</code> attribute is + an IP address for the server to listen + on. The <code>passwd</code> attribute provides a SPICE + password in clear text. The <code>keymap</code> + attribute specifies the keymap to use. It is possible to + set a limit on the validity of the password be giving an + timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> + assumed to be in UTC. NB, this may not be supported by + all hypervisors."spice" since 0.8.6. - When SPICE has both a normal and TLS secured TCP port configured, it - can be desirable to restrict what channels can be run on each port. - This is achieved by adding one or more <channel> elements inside - the main <graphics> element. Valid channel names include - <code>main</code>, <code>display</code>, <code>inputs</code>, - <code>cursor</code>, <code>playback</code>, <code>record</code>; - and since 0.8.8: <code>smartcard</code>. + When SPICE has both a normal and TLS secured TCP port + configured, it can be desirable to restrict what + channels can be run on each port. This is achieved by + adding one or more <channel> elements inside the + main <graphics> element. Valid channel names + include <code>main</code>, <code>display</code>, + <code>inputs</code>, <code>cursor</code>, + <code>playback</code>, <code>record</code>; + and since + 0.8.8: <code>smartcard</code>. <pre> <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'> @@ -1951,23 +1975,27 @@ qemu-kvm -net nic,model=? /dev/null </dd> <dt><code>"rdp"</code></dt> <dd> - Starts a RDP server. The <code>port</code> attribute - specifies the TCP port number (with -1 as legacy syntax indicating - that it should be auto-allocated). The <code>autoport</code> attribute - is the new preferred syntax for indicating autoallocation of the TCP - port to use. The <code>replaceUser</code> attribute is a boolean deciding - whether multiple simultaneous connections to the VM are permitted. - The <code>multiUser</code> whether the existing connection must be dropped - and a new connection must be established by the VRDP server, when a new - client connects in single connection mode. - + Starts a RDP server. The <code>port</code> attribute + specifies the TCP port number (with -1 as legacy syntax + indicating that it should be + auto-allocated). The <code>autoport</code> attribute is + the new preferred syntax for indicating autoallocation of + the TCP port to use. The <code>replaceUser</code> + attribute is a boolean deciding whether multiple + simultaneous connections to the VM are permitted. + The <code>multiUser</code> whether the existing connection + must be dropped and a new connection must be established + by the VRDP server, when a new client connects in single + connection mode. </dd> <dt><code>"desktop"</code></dt> <dd> - This value is reserved for VirtualBox domains for the moment. It displays - a window on the host desktop, similarly to "sdl", but using the VirtualBox - viewer. Just like "sdl", it accepts the optional attributes <code>display</code> - and <code>fullscreen</code>. + This value is reserved for VirtualBox domains for the + moment. It displays a window on the host desktop, + similarly to "sdl", but using the VirtualBox viewer. Just + like "sdl", it accepts the optional + attributes <code>display</code> + and <code>fullscreen</code>. </dd> </dl> </dd> @@ -2389,8 +2417,9 @@ qemu-kvm -net nic,model=? /dev/null ...</pre> - Alternatively you can use <code>telnet</code> instead of <code>raw</code> TCP. - Since 0.8.5 you can also use <code>telnets</code> + Alternatively you can use <code>telnet</code> instead + of <code>raw</code> TCP. Since 0.8.5 + you can also use <code>telnets</code> (secure telnet) and <code>tls</code>. -- 1.7.4.4

2 1

[libvirt] Virsh Command Reference is out of date
by Gui Jianfeng 07 Jul '11

07 Jul '11

Hi, Virsh Command Reference on libvirt.org seems out of date, it's at libvirt 0.8.7 http://libvirt.org/sources/virshcmdref/html-single/ Any one can help to update it to latest stable libvirt? Thanks, Gui

2 1

Re: [libvirt] php-virt-control
by Michal Novotny 07 Jul '11

07 Jul '11

On 07/03/2011 05:28 PM, Andreas Cymbal wrote: > > Hello i have some problem with php-virt-control > > */Message:/**/ /*/Cannot connect to hypervisor. Please change > connection information. /(Local)// > > Virt-manager run without Problems > > Virsh run only with sudo virsh > > My System is Ubuntu 10.04 LTS 64 > > With Xen 4.1.1 and 2.6.32.40 > > Libvirt 0.9.2 > > How does xen+ssh work without any password or ssh keys? > > Yours AndrewCat > Hi Andrew, it can't. The xen+ssh or anything+ssh is requiring the keys since libvirt is using ssh command directly and not libssh2 so it doesn't work even with the password specified. The only thing you have to do it to provide the SSH keys to the apache. You can run the 'tools/apache-key-copy' tool from the repository which will automatically generate the keys for user "apache" if it doesn't exist and copy it to the remote host which is required. If you see the message about libvirt-php cannot connect to the hypervisor then you should try setting up the connection information in the form at the bottom of the page. Is the system having the PolicyKit or something similar to this? You need to enable the authentication for virsh not to require password for the connection to 'xen:///' (which should be the local Xen connection URI). For more information about authentication please see the libvirt authentication page at http://libvirt.org/auth.html . Thanks, Michal -- Michal Novotny <minovotn(a)redhat.com>, RHCE, Red Hat Virtualization | libvirt-php bindings | php-virt-control.org

1 0

[libvirt] 腾讯 could you give me any suggestions when running libvirtd in the container
by kevenzhu(朱以军) 07 Jul '11

07 Jul '11

Hi all: we manage the contaienr vms using libvirt, and we want to mornitor the vms by running the libvirtd in the container. but there is something wrong with it, a lock in the kernel is crashed. if you run the "sudo" or "ping" .etc, the system call can NOT be returned, the status of the command is D. would you like to give me the hand. Thank you BR.

1 0

[libvirt] Fwd: cvs commit: ports/devel/libvirt Makefile distinfo ports/devel/libvirt/files patch-docs__apibuild.py patch-libvirtd.h
by Jason Helfman 06 Jul '11

06 Jul '11

libvirt has been updated for FreeBSD to the latest. -jgh -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

1 0

[libvirt] [PATCHv2 0/2] delete unnecessary white space of sysinfo.
by Minoru Usui 06 Jul '11

06 Jul '11

sysinfo: delete unnecessary white space of sysinfo. This is v2 of delete unnecessary white space of sysinfo. Changes v1->v2: - Rebase latest libvirt GIT tree. - Use c_isspace() in virSkipSpacesBackwards(). Minoru Usui (2): sysinfo: add virSkipSpacesBackwards() sysinfo: delete unnecessary white space of sysinfo. src/util/sysinfo.c | 21 +++++++++++++++++++++ src/util/util.c | 25 +++++++++++++++++++++++++ src/util/util.h | 1 + 3 files changed, 47 insertions(+), 0 deletions(-) -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

2 10

[libvirt] building error
by Wen Congyang 06 Jul '11

06 Jul '11

When I build libvirt, I meet the following error: make[3]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.2/daemon' CC libvirtd-libvirtd.o CC libvirtd-remote.o remote.c: In function 'remoteDispatchAuthPolkit': remote.c:2043: error: invalid initializer make[3]: *** [libvirtd-remote.o] Error 1 This patch can fix the problem. But I do not know whether it is right. >From b03a5c08b751440460bf4cb02fea061b77fb3ef5 Mon Sep 17 00:00:00 2001 From: Wen Congyang <wency(a)cn.fujitsu.com> Date: Wed, 29 Jun 2011 19:04:19 +0800 Subject: [PATCH 1/2] daemon: Fix building error with polkit1 --- daemon/remote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9e6cf77..042894b 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2041,7 +2041,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, goto authdeny; } PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_POLKIT, ident); + virNetServerClientGetFD(client), REMOTE_AUTH_POLKIT, (char *)ident); VIR_INFO("Policy allowed action %s from pid %d, uid %d", action, callerPid, callerUid); ret->complete = 1; -- 1.7.1

4 13

[libvirt] libvirt 0.9.3, missing header
by Jason Helfman 06 Jul '11

06 Jul '11

When building the latest code in a clean building environment, with sasl disabled, I get this error: gmake[3]: Entering directory `/work/a/ports/devel/libvirt/work/libvirt-0.9.3/daemon' CC libvirtd-libvirtd.o In file included from libvirtd.h:41, from libvirtd.c:41: ../src/rpc/virnetsaslcontext.h:24:24: error: sasl/sasl.h: No such file or directory In file included from libvirtd.h:41, from libvirtd.c:41: ../src/rpc/virnetsaslcontext.h:54: warning: type defaults to 'int' in declaration of 'sasl_callback_t' ../src/rpc/virnetsaslcontext.h:54: error: expected ';', ',' or ')' before '*' token ../src/rpc/virnetsaslcontext.h:78: error: expected declaration specifiers or '...' before 'sasl_interact_t' ../src/rpc/virnetsaslcontext.h:86: error: expected declaration specifiers or '...' before 'sasl_interact_t' gmake[3]: *** [libvirtd-libvirtd.o] Error 1 gmake[3]: Leaving directory `/work/a/ports/devel/libvirt/work/libvirt-0.9.3/daemon' gmake[2]: *** [all] Error 2 gmake[2]: Leaving directory `/work/a/ports/devel/libvirt/work/libvirt-0.9.3/daemon' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/work/a/ports/devel/libvirt/work/libvirt-0.9.3' gmake: *** [all] Error 2 *** Error code 1 Any ideas? Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

2 2

[libvirt] Strange failure of commandtest when doing F15 build
by Laine Stump 06 Jul '11

06 Jul '11

Today I added some patches to the f15 branch of Fedora libvirt, ran "fedpkg local" to be sure it was all in order, then did a "fedpkg commit -p" and "fedpkg build". When I came back awhile later, I found that it had failed. Looking in the logs, I could see that the failure was due to tests/commandtest. Since the failure says almost nothing (and there was nothing even remotely related in any of the changes), I decided to try and build 1) the older libvirt and 2) with debugging turned on in the tests. I had no idea how to do this, but nirik in #fedora-devel helped me out, and I did the following: 1) reverted the libvirt.spec file locally (so that I'm working with source that previously built) 2) added the following lines just prior to "make check" in the specfile: export VIR_TEST_VERBOSE=1 export LIBVIRT_LOG_OUTPUTS=3:stderr export LIBVIRT_LOG_FILTERS="1:command" export VIR_TEST_DEBUG=2 3) added something identifiable to the version string in libvirt.spec: Release: 4.test%{?dist}%{?extra_release} 4) fedpkg srpm 5) koji build --scratch dist-f15 libvirt-0.8.8-4.test.fc15.src.rpm This build also failed. The results are here: http://koji.fedoraproject.org/koji/taskinfo?taskID=3182099 (search for "... FAIL") So it appears that some other package on the build machine has been updated, and it's causing most of the tests in commandtest to fail. Unfortunately, even when debugging is turned on the tests don't say anything about why they failed. Any ideas?

2 1

[libvirt] [PATCH] Reduce code duplication in virFileMakePath(Helper)
by Matthias Bolte 06 Jul '11

06 Jul '11

Move stat and mkdir to virFileMakePathHelper. Also use the stat result to detect whether the existing path is a directory and set errno accordingly if it's not. --- src/util/util.c | 44 ++++++++++++++------------------------------ 1 files changed, 14 insertions(+), 30 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 4710fc5..d944123 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1013,11 +1013,17 @@ int virDirCreate(const char *path ATTRIBUTE_UNUSED, static int virFileMakePathHelper(char *path) { struct stat st; - char *p = NULL; + char *p; - if (stat(path, &st) >= 0) - return 0; - else if (errno != ENOENT) + if (stat(path, &st) >= 0) { + if (S_ISDIR(st.st_mode)) + return 0; + + errno = ENOTDIR; + return -1; + } + + if (errno != ENOENT) return -1; if ((p = strrchr(path, '/')) == NULL) { @@ -1049,39 +1055,17 @@ static int virFileMakePathHelper(char *path) int virFileMakePath(const char *path) { int ret = -1; - struct stat st; - char *parent = NULL; - char *p; - - if (stat(path, &st) >= 0) - return 0; - else if (errno != ENOENT) - goto cleanup; + char *tmp; - if ((parent = strdup(path)) == NULL) { + if ((tmp = strdup(path)) == NULL) { errno = ENOMEM; goto cleanup; } - if ((p = strrchr(parent, '/')) == NULL) { - errno = EINVAL; - goto cleanup; - } - - if (p != parent) { - *p = '\0'; - - if (virFileMakePathHelper(parent) < 0) - goto cleanup; - } - - if (mkdir(path, 0777) < 0 && errno != EEXIST) - goto cleanup; - - ret = 0; + ret = virFileMakePathHelper(tmp); cleanup: - VIR_FREE(parent); + VIR_FREE(tmp); return ret; } -- 1.7.4.1

2 3

[libvirt] [PATCH] util: close the ioctl socket at the end of if(Get|Set)MacAddress
by Laine Stump 06 Jul '11

06 Jul '11

Otherwise this will leak an fd each time one of these functions is called. --- src/util/interface.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/util/interface.c b/src/util/interface.c index f486124..178a4dd 100644 --- a/src/util/interface.c +++ b/src/util/interface.c @@ -413,6 +413,7 @@ ifaceGetMacAddress(const char *ifname, { struct ifreq ifr; int fd; + int rc = 0; if (!ifname) return EINVAL; @@ -422,15 +423,21 @@ ifaceGetMacAddress(const char *ifname, return errno; memset(&ifr, 0, sizeof(struct ifreq)); - if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) - return EINVAL; + if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) { + rc = EINVAL; + goto err_exit; + } - if (ioctl(fd, SIOCGIFHWADDR, (char *)&ifr) != 0) - return errno; + if (ioctl(fd, SIOCGIFHWADDR, (char *)&ifr) != 0) { + rc = errno; + goto err_exit; + } memcpy(macaddr, ifr.ifr_ifru.ifru_hwaddr.sa_data, VIR_MAC_BUFLEN); - return 0; +err_exit: + VIR_FORCE_CLOSE(fd); + return rc; } #else @@ -461,6 +468,7 @@ ifaceSetMacAddress(const char *ifname, { struct ifreq ifr; int fd; + int rc = 0; if (!ifname) return EINVAL; @@ -470,16 +478,24 @@ ifaceSetMacAddress(const char *ifname, return errno; memset(&ifr, 0, sizeof(struct ifreq)); - if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) - return EINVAL; + if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) { + rc = EINVAL; + goto err_exit; + } /* To fill ifr.ifr_hdaddr.sa_family field */ - if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) - return errno; + if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) { + rc = errno; + goto err_exit; + } memcpy(ifr.ifr_hwaddr.sa_data, macaddr, VIR_MAC_BUFLEN); - return ioctl(fd, SIOCSIFHWADDR, &ifr) == 0 ? 0 : errno; + rc = ioctl(fd, SIOCSIFHWADDR, &ifr) == 0 ? 0 : errno; + +err_exit: + VIR_FORCE_CLOSE(fd); + return rc; } #else -- 1.7.3.4

2 5

[libvirt] [PATCH] apparmor: Finish incomplete renaming of relabel to norelabel
by Matthias Bolte 06 Jul '11

06 Jul '11

Commit 693eac388f1759d was incomplete here. --- Pushing this under the build-breaker rule. src/security/security_apparmor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 76c6e3d..6dfe8c9 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -461,7 +461,7 @@ static int AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr, virDomainObjPtr vm, const char *stdin_path) { - if (!vm->def->seclabel.relabel) + if (vm->def->seclabel.norelabel) return 0; /* Reload the profile if stdin_path is specified. Note that -- 1.7.4.1

1 0

[libvirt] [PATCH v2] qemu: Add support for SGA
by Michal Privoznik 06 Jul '11

06 Jul '11

This patch creates new attribute 'sga' for <serial> element. Serial Graphics Adapter allows users to see BIOS messages from the very first moment domain boots up. Therefore, users can choose boot medium, set PXE, etc. However, to be able to use this, one need SGABIOS, which is accessible here: http://code.google.com/p/sgabios/ --- diff to v1: -move from <video> to <serial> as Dan suggested: https://www.redhat.com/archives/libvir-list/2011-July/msg00134.html docs/formatdomain.html.in | 10 ++++-- docs/schemas/domain.rng | 20 +++++++++--- src/conf/domain_conf.c | 34 ++++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++ .../qemuxml2argv-serial-pty-chardev.args | 3 +- .../qemuxml2argv-serial-pty-chardev.xml | 2 +- tests/qemuxml2argvtest.c | 3 +- 10 files changed, 78 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fe8d74c..1e9eee5 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2040,7 +2040,7 @@ qemu-kvm -net nic,model=? /dev/null <source path='/dev/pts/2'/> <target port='0'/> </parallel> - <serial type='pty'> + <serial type='pty' sga='on'> <source path='/dev/pts/3'/> <target port='0'/> </serial> @@ -2105,7 +2105,7 @@ qemu-kvm -net nic,model=? /dev/null <pre> ... <devices> - <serial type='pty'> + <serial type='pty' sga='on'> <source path='/dev/pts/3'/> <target port='0'/> </serial> @@ -2115,7 +2115,11 @@ qemu-kvm -net nic,model=? /dev/null <code>target</code> can have a <code>port</code> attribute, which specifies the port number. Ports are numbered starting from 0. There are - usually 0, 1 or 2 serial ports. + usually 0, 1 or 2 serial ports. The <code>sga</code> attribute enables + or disables Serial Graphics Adapter. Accepted values are <code>on</code> + and <code>off</code>. To be able to use this feature, you need to install + <a href="http://code.google.com/p/sgabios/">SGABios</a>. SGA + Since 0.9.4 <h6><a name="elementCharConsole">Console</a></h6> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fb1497b..e9539d5 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1618,11 +1618,21 @@ --> <define name="qemucdev"> <ref name="qemucdevSrcType"/> - <optional> - <attribute name="tty"> - <ref name="absFilePath"/> - </attribute> - </optional> + <interleave> + <optional> + <attribute name="tty"> + <ref name="absFilePath"/> + </attribute> + </optional> + <optional> + <attribute name="sga"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> + </interleave> <interleave> <ref name="qemucdevSrcDef"/> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..cb7fe23 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -258,6 +258,11 @@ VIR_ENUM_IMPL(virDomainChrSpicevmc, VIR_DOMAIN_CHR_SPICEVMC_LAST, "vdagent", "smartcard") +VIR_ENUM_IMPL(virDomainChrSGA, VIR_DOMAIN_CHR_SGA_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainSmartcard, VIR_DOMAIN_SMARTCARD_TYPE_LAST, "host", "host-certificates", @@ -3488,6 +3493,10 @@ virDomainChrDefNew(void) { * <target port="1"/> * </serial> * + * <serial type="pty" sga="on"> + * <target port="0"/> + * </serial> + * * <serial type="dev"> * <source path="/dev/ttyS0"/> * <target port="1"/> @@ -3522,6 +3531,7 @@ virDomainChrDefParseXML(virCapsPtr caps, int flags) { xmlNodePtr cur; char *type = NULL; + char *sga = NULL; const char *nodeName; virDomainChrDefPtr def; int remaining; @@ -3530,6 +3540,7 @@ virDomainChrDefParseXML(virCapsPtr caps, return NULL; type = virXMLPropString(node, "type"); + sga = virXMLPropString(node, "sga"); if (type == NULL) { def->source.type = VIR_DOMAIN_CHR_TYPE_PTY; } else if ((def->source.type = virDomainChrTypeFromString(type)) < 0) { @@ -3539,6 +3550,13 @@ virDomainChrDefParseXML(virCapsPtr caps, goto error; } + if (sga && (def->source.sga=virDomainChrSGATypeFromString(sga)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown value for sga: %s"), + sga); + goto error; + } + nodeName = (const char *) node->name; if ((def->deviceType = virDomainChrDeviceTypeFromString(nodeName)) < 0) { virDomainReportError(VIR_ERR_XML_ERROR, @@ -3580,6 +3598,7 @@ virDomainChrDefParseXML(virCapsPtr caps, cleanup: VIR_FREE(type); + VIR_FREE(sga); return def; @@ -8739,9 +8758,11 @@ static int virDomainChrSourceDefFormat(virBufferPtr buf, virDomainChrSourceDefPtr def, bool tty_compat, + int deviceType, int flags) { const char *type = virDomainChrTypeToString(def->type); + const char *sga = virDomainChrSGATypeToString(def->sga); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -8755,6 +8776,14 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virBufferEscapeString(buf, " tty='%s'", def->data.file.path); } + if (deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && def->sga) { + if (!sga) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected sga value %d"), def->sga); + return -1; + } + virBufferAsprintf(buf, " sga='%s'", sga); + } virBufferAddLit(buf, ">\n"); switch (def->type) { @@ -8857,7 +8886,8 @@ virDomainChrDefFormat(virBufferPtr buf, def->source.type == VIR_DOMAIN_CHR_TYPE_PTY && !(flags & VIR_DOMAIN_XML_INACTIVE) && def->source.data.file.path); - if (virDomainChrSourceDefFormat(buf, &def->source, tty_compat, flags) < 0) + if (virDomainChrSourceDefFormat(buf, &def->source, tty_compat, + def->deviceType, flags) < 0) return -1; /* Format <target> block */ @@ -8962,7 +8992,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: if (virDomainChrSourceDefFormat(buf, &def->data.passthru, false, - flags) < 0) + -1, flags) < 0) return -1; break; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 258289a..ab0632c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -457,11 +457,20 @@ enum virDomainChrSpicevmcName { VIR_DOMAIN_CHR_SPICEVMC_LAST, }; +enum virDomainChrSGA { + VIR_DOMAIN_CHR_SGA_DEFAULT = 0, + VIR_DOMAIN_CHR_SGA_ON, + VIR_DOMAIN_CHR_SGA_OFF, + + VIR_DOMAIN_CHR_SGA_LAST +}; + /* The host side information for a character device. */ typedef struct _virDomainChrSourceDef virDomainChrSourceDef; typedef virDomainChrSourceDef *virDomainChrSourceDefPtr; struct _virDomainChrSourceDef { int type; /* virDomainChrType */ + int sga; /* Serial Graphics Adapter */ union { /* no <source> for null, vc, stdio */ struct { @@ -1570,6 +1579,7 @@ VIR_ENUM_DECL(virDomainSmartcard) VIR_ENUM_DECL(virDomainChr) VIR_ENUM_DECL(virDomainChrTcpProtocol) VIR_ENUM_DECL(virDomainChrSpicevmc) +VIR_ENUM_DECL(virDomainChrSGA) VIR_ENUM_DECL(virDomainSoundModel) VIR_ENUM_DECL(virDomainMemballoonModel) VIR_ENUM_DECL(virDomainSmbiosMode) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ad62a07..2dfe375 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -122,6 +122,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-multifunction", /* 60 */ "virtio-blk-pci.ioeventfd", + "sga", ); struct qemu_feature_flags { @@ -1210,6 +1211,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_DEVICE_QXL_VGA); if (strstr(str, "virtio-blk-pci.ioeventfd")) qemuCapsSet(flags, QEMU_CAPS_VIRTIO_IOEVENTFD); + if (strstr(str, "name \"sga\"")) + qemuCapsSet(flags, QEMU_CAPS_SGA); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0b9c8be..d251262 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -97,6 +97,7 @@ enum qemuCapsFlags { QEMU_CAPS_DEVICE_QXL_VGA = 59, /* Is the primary and vga campatible qxl device named qxl-vga? */ QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* IOeventFD feature: virtio-{net|blk}-pci.ioeventfd=on/off */ + QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ 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 6e4480e..29936a6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3884,6 +3884,11 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-device"); virCommandAddArgFormat(cmd, "isa-serial,chardev=char%s,id=%s", serial->info.alias, serial->info.alias); + + if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + serial->source.sga == VIR_DOMAIN_CHR_SGA_ON && + qemuCapsGet(qemuCaps, QEMU_CAPS_SGA)) + virCommandAddArgList(cmd, "-device", "sga", NULL); } else { virCommandAddArg(cmd, "-serial"); if (!(devstr = qemuBuildChrArgStr(&serial->source, NULL))) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args index 4a6202e..369379f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args @@ -2,5 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,\ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \ -pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb \ +pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 \ +-device sga -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml index 57d1b74..31eb7d1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml @@ -20,7 +20,7 @@ <address type='drive' controller='0' bus='0' unit='0'/> </disk> <controller type='ide' index='0'/> - <serial type='pty'> + <serial type='pty' sga='on'> <target port='0'/> </serial> <console type='pty'> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ec1f4b5..b4562d1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -425,7 +425,8 @@ mymain(void) DO_TEST("serial-vc-chardev", false, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-pty-chardev", false, - QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SGA); DO_TEST("serial-dev-chardev", false, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-file-chardev", false, -- 1.7.5.rc3

3 2

[libvirt] [PATCH] Fix return value semantic of virFileMakePath
by Matthias Bolte 06 Jul '11

06 Jul '11

Some callers expected virFileMakePath to set errno, some expected it to return an errno value. Unify this to return 0 on success and -1 on error. Set errno to report detailed error information. Also Make virFileMakePath report an error when stat fails with an errno different from ENOENT. --- src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 5 +-- src/conf/nwfilter_conf.c | 11 +++----- src/conf/storage_conf.c | 6 +--- src/libxl/libxl_driver.c | 14 ++++----- src/lxc/lxc_container.c | 18 ++++++------ src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 10 +++---- src/network/bridge_driver.c | 25 ++++++++--------- src/qemu/qemu_driver.c | 28 ++++++++----------- src/qemu/qemu_process.c | 2 +- src/storage/storage_backend_fs.c | 4 +- src/storage/storage_driver.c | 6 +--- src/uml/uml_driver.c | 10 +++---- src/util/dnsmasq.c | 5 +-- src/util/util.c | 56 ++++++++++++++++++++++++------------- 16 files changed, 100 insertions(+), 104 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..64c5636 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9986,7 +9986,7 @@ int virDomainSaveXML(const char *configDir, if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; - if (virFileMakePath(configDir)) { + if (virFileMakePath(configDir) < 0) { virReportSystemError(errno, _("cannot create config directory '%s'"), configDir); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 45ddee2..ae479bf 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1114,13 +1114,12 @@ int virNetworkSaveXML(const char *configDir, char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; - int err; if ((configFile = virNetworkConfigFile(configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { - virReportSystemError(err, + if (virFileMakePath(configDir) < 0) { + virReportSystemError(errno, _("cannot create config directory '%s'"), configDir); goto cleanup; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 127d4be..036c61a 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2184,13 +2184,12 @@ int virNWFilterSaveXML(const char *configDir, char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; - int err; if ((configFile = virNWFilterConfigFile(configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { - virReportSystemError(err, + if (virFileMakePath(configDir) < 0) { + virReportSystemError(errno, _("cannot create config directory '%s'"), configDir); goto cleanup; @@ -2574,10 +2573,8 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, ssize_t towrite; if (!nwfilter->configFile) { - int err; - - if ((err = virFileMakePath(driver->configDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->configDir) < 0) { + virReportSystemError(errno, _("cannot create config directory %s"), driver->configDir); return -1; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ca86f19..f6f8be1 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1512,10 +1512,8 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, ssize_t towrite; if (!pool->configFile) { - int err; - - if ((err = virFileMakePath(driver->configDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->configDir) < 0) { + virReportSystemError(errno, _("cannot create config directory %s"), driver->configDir); return -1; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7fd257d..ade69d8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -914,25 +914,25 @@ libxlStartup(int privileged) { "%s", LIBXL_SAVE_DIR) == -1) goto out_of_memory; - if (virFileMakePath(libxl_driver->logDir) != 0) { + if (virFileMakePath(libxl_driver->logDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create log dir '%s': %s"), libxl_driver->logDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->stateDir) != 0) { + if (virFileMakePath(libxl_driver->stateDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), libxl_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->libDir) != 0) { + if (virFileMakePath(libxl_driver->libDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), libxl_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->saveDir) != 0) { + if (virFileMakePath(libxl_driver->saveDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), libxl_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); @@ -3389,10 +3389,8 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("cannot create autostart directory %s"), driver->autostartDir); goto cleanup; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7924858..ef8469c 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -308,7 +308,7 @@ static int lxcContainerChildMountSort(const void *a, const void *b) static int lxcContainerPivotRoot(virDomainFSDefPtr root) { - int rc, ret; + int ret; char *oldroot = NULL, *newroot = NULL; ret = -1; @@ -325,8 +325,8 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if ((rc = virFileMakePath(oldroot)) != 0) { - virReportSystemError(rc, + if (virFileMakePath(oldroot) < 0) { + virReportSystemError(errno, _("Failed to create %s"), oldroot); goto err; @@ -347,8 +347,8 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if ((rc = virFileMakePath(newroot)) != 0) { - virReportSystemError(rc, + if (virFileMakePath(newroot) < 0) { + virReportSystemError(errno, _("Failed to create %s"), newroot); goto err; @@ -415,7 +415,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) { - if (virFileMakePath(mnts[i].dst) != 0) { + if (virFileMakePath(mnts[i].dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), mnts[i].src); @@ -429,8 +429,8 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } } - if ((rc = virFileMakePath("/dev/pts") != 0)) { - virReportSystemError(rc, "%s", + if (virFileMakePath("/dev/pts") < 0) { + virReportSystemError(errno, "%s", _("Cannot create /dev/pts")); goto cleanup; } @@ -531,7 +531,7 @@ static int lxcContainerMountNewFS(virDomainDefPtr vmDef) return -1; } - if (virFileMakePath(vmDef->fss[i]->dst) != 0) { + if (virFileMakePath(vmDef->fss[i]->dst) < 0) { virReportSystemError(errno, _("Failed to create %s"), vmDef->fss[i]->dst); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 7d60090..31c7d4f 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -690,7 +690,7 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } - if (virFileMakePath(devpts) != 0) { + if (virFileMakePath(devpts) < 0) { virReportSystemError(errno, _("Failed to make path %s"), devpts); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7220a9b..ffcfe4d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1502,8 +1502,8 @@ static int lxcVmStart(virConnectPtr conn, return -1; } - if ((r = virFileMakePath(driver->logDir)) != 0) { - virReportSystemError(r, + if (virFileMakePath(driver->logDir) < 0) { + virReportSystemError(errno, _("Cannot create log directory '%s'"), driver->logDir); return -1; @@ -2539,10 +2539,8 @@ static int lxcDomainSetAutostart(virDomainPtr dom, goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("Cannot create autostart directory %s"), driver->autostartDir); goto cleanup; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 660dd65..170bf98 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -692,17 +692,16 @@ networkStartDhcpDaemon(virNetworkObjPtr network) virCommandPtr cmd = NULL; char *pidfile = NULL; int ret = -1; - int err; dnsmasqContext *dctx = NULL; - if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(NETWORK_PID_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), NETWORK_PID_DIR); goto cleanup; } - if ((err = virFileMakePath(NETWORK_STATE_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(NETWORK_STATE_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), NETWORK_STATE_DIR); goto cleanup; @@ -713,8 +712,8 @@ networkStartDhcpDaemon(virNetworkObjPtr network) goto cleanup; } - if ((err = virFileMakePath(DNSMASQ_STATE_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(DNSMASQ_STATE_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), DNSMASQ_STATE_DIR); goto cleanup; @@ -777,14 +776,14 @@ networkStartRadvd(virNetworkObjPtr network) goto cleanup; } - if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(NETWORK_PID_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), NETWORK_PID_DIR); goto cleanup; } - if ((err = virFileMakePath(RADVD_STATE_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(RADVD_STATE_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), RADVD_STATE_DIR); goto cleanup; @@ -2500,7 +2499,7 @@ static int networkSetAutostart(virNetworkPtr net, struct network_driver *driver = net->conn->networkPrivateData; virNetworkObjPtr network; char *configFile = NULL, *autostartLink = NULL; - int ret = -1; + int ret = -1, err; networkDriverLock(driver); network = virNetworkFindByUUID(&driver->networks, net->uuid); @@ -2526,7 +2525,7 @@ static int networkSetAutostart(virNetworkPtr net, goto cleanup; if (autostart) { - if (virFileMakePath(driver->networkAutostartDir)) { + if (virFileMakePath(driver->networkAutostartDir) < 0) { virReportSystemError(errno, _("cannot create autostart directory '%s'"), driver->networkAutostartDir); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aab3ab9..0f645fa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -469,37 +469,37 @@ qemudStartup(int privileged) { goto out_of_memory; } - if (virFileMakePath(qemu_driver->stateDir) != 0) { + if (virFileMakePath(qemu_driver->stateDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->libDir) != 0) { + if (virFileMakePath(qemu_driver->libDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->cacheDir) != 0) { + if (virFileMakePath(qemu_driver->cacheDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create cache dir '%s': %s"), qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->saveDir) != 0) { + if (virFileMakePath(qemu_driver->saveDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), qemu_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->snapshotDir) != 0) { + if (virFileMakePath(qemu_driver->snapshotDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), qemu_driver->snapshotDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->autoDumpPath) != 0) { + if (virFileMakePath(qemu_driver->autoDumpPath) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create dump dir '%s': %s"), qemu_driver->autoDumpPath, virStrerror(errno, ebuf, sizeof ebuf)); @@ -586,8 +586,8 @@ qemudStartup(int privileged) { if (virAsprintf(&mempath, "%s/libvirt/qemu", qemu_driver->hugetlbfs_mount) < 0) goto out_of_memory; - if ((rc = virFileMakePath(mempath)) != 0) { - virReportSystemError(rc, + if (virFileMakePath(mempath) < 0) { + virReportSystemError(errno, _("unable to create hugepage path %s"), mempath); VIR_FREE(mempath); goto error; @@ -5017,10 +5017,8 @@ static int qemudDomainSetAutostart(virDomainPtr dom, goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("cannot create autostart directory %s"), driver->autostartDir); goto cleanup; @@ -7483,7 +7481,6 @@ static int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, int ret = -1; char *snapDir = NULL; char *snapFile = NULL; - int err; char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(vm->def->uuid, uuidstr); @@ -7497,9 +7494,8 @@ static int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, virReportOOMError(); goto cleanup; } - err = virFileMakePath(snapDir); - if (err != 0) { - virReportSystemError(err, _("cannot create snapshot directory '%s'"), + if (virFileMakePath(snapDir) < 0) { + virReportSystemError(errno, _("cannot create snapshot directory '%s'"), snapDir); goto cleanup; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f2c439b..c9145cb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2448,7 +2448,7 @@ int qemuProcessStart(virConnectPtr conn, } } - if (virFileMakePath(driver->logDir) != 0) { + if (virFileMakePath(driver->logDir) < 0) { virReportSystemError(errno, _("cannot create log directory %s"), driver->logDir); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index f2912f0..d87401f 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -559,8 +559,8 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED, /* assure all directories in the path prior to the final dir * exist, with default uid/gid/mode. */ *p = '\0'; - if ((err = virFileMakePath(parent)) != 0) { - virReportSystemError(err, _("cannot create path '%s'"), + if (virFileMakePath(parent) < 0) { + virReportSystemError(errno, _("cannot create path '%s'"), parent); goto error; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f9652f8..a990118 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1019,10 +1019,8 @@ storagePoolSetAutostart(virStoragePoolPtr obj, if (pool->autostart != autostart) { if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("cannot create autostart directory %s"), driver->autostartDir); goto cleanup; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index a71ea21..f0f053b 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -420,7 +420,7 @@ umlStartup(int privileged) goto error; } - if (virFileMakePath(uml_driver->monitorDir) != 0) { + if (virFileMakePath(uml_driver->monitorDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create monitor directory %s: %s"), uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); @@ -839,7 +839,7 @@ static int umlStartVMDaemon(virConnectPtr conn, return -1; } - if (virFileMakePath(driver->logDir) != 0) { + if (virFileMakePath(driver->logDir) < 0) { virReportSystemError(errno, _("cannot create log directory %s"), driver->logDir); @@ -2004,10 +2004,8 @@ static int umlDomainSetAutostart(virDomainPtr dom, goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("cannot create autostart directory %s"), driver->autostartDir); goto cleanup; diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index aadca10..55db96b 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -523,11 +523,10 @@ dnsmasqAddHost(dnsmasqContext *ctx, int dnsmasqSave(const dnsmasqContext *ctx) { - int err; int ret = 0; - if ((err = virFileMakePath(ctx->config_dir))) { - virReportSystemError(err, _("cannot create config directory '%s'"), + if (virFileMakePath(ctx->config_dir) < 0) { + virReportSystemError(errno, _("cannot create config directory '%s'"), ctx->config_dir); return -1; } diff --git a/src/util/util.c b/src/util/util.c index 13973c3..482ca6b 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1010,66 +1010,80 @@ int virDirCreate(const char *path ATTRIBUTE_UNUSED, } #endif /* WIN32 */ -static int virFileMakePathHelper(char *path) { +static int virFileMakePathHelper(char *path) +{ struct stat st; char *p = NULL; - int err; if (stat(path, &st) >= 0) return 0; + else if (errno != ENOENT) + return -1; - if ((p = strrchr(path, '/')) == NULL) - return EINVAL; + if ((p = strrchr(path, '/')) == NULL) { + errno = EINVAL; + return -1; + } if (p != path) { *p = '\0'; - err = virFileMakePathHelper(path); + + if (virFileMakePathHelper(path) < 0) + return -1; + *p = '/'; - if (err != 0) - return err; } - if (mkdir(path, 0777) < 0 && errno != EEXIST) { - return errno; - } + if (mkdir(path, 0777) < 0 && errno != EEXIST) + return -1; + return 0; } +/** + * Creates the given path with mode 0777 if it's not already existing + * completely. + * + * Returns 0 on success, or -1 if an error occurred (in which case, errno + * is set appropriately). + */ int virFileMakePath(const char *path) { + int ret = -1; struct stat st; char *parent = NULL; char *p; - int err = 0; if (stat(path, &st) >= 0) + return 0; + else if (errno != ENOENT) goto cleanup; if ((parent = strdup(path)) == NULL) { - err = ENOMEM; + errno = ENOMEM; goto cleanup; } if ((p = strrchr(parent, '/')) == NULL) { - err = EINVAL; + errno = EINVAL; goto cleanup; } if (p != parent) { *p = '\0'; - if ((err = virFileMakePathHelper(parent)) != 0) { + + if (virFileMakePathHelper(parent) < 0) goto cleanup; - } } - if (mkdir(path, 0777) < 0 && errno != EEXIST) { - err = errno; + if (mkdir(path, 0777) < 0 && errno != EEXIST) goto cleanup; - } + + ret = 0; cleanup: VIR_FREE(parent); - return err; + return ret; } /* Build up a fully qualified path for a config file to be @@ -1182,8 +1196,10 @@ int virFileWritePid(const char *dir, goto cleanup; } - if ((rc = virFileMakePath(dir))) + if (virFileMakePath(dir) < 0) { + rc = errno; goto cleanup; + } if (!(pidfile = virFilePid(dir, name))) { rc = ENOMEM; -- 1.7.4.1

2 2

[libvirt] [PATCH] nodedev: Let check_fc_host_linux report errors to the caller
by Matthias Bolte 06 Jul '11

06 Jul '11

--- src/node_device/node_device_linux_sysfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 4f4acc7..34e4501 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -156,7 +156,7 @@ out: VIR_FREE(d->scsi_host.wwpn); } VIR_FREE(sysfs_path); - return 0; + return retval; } -- 1.7.4.1

2 2

[libvirt] [PATCH] Fix compilation error when SASL support is disabled
by Jean-Baptiste Rouault 06 Jul '11

06 Jul '11

This patch adds #if HAVE_SASL where needed in libvirtd.h --- daemon/libvirtd.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index 6c604fc..8e1843c 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -38,7 +38,9 @@ # include "logging.h" # include "threads.h" # include "network.h" -# include "virnetsaslcontext.h" +# if HAVE_SASL +# include "virnetsaslcontext.h" +# endif # include "virnetserverprogram.h" # if WITH_DTRACE @@ -70,7 +72,9 @@ struct daemonClientPrivate { int domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LAST]; +# if HAVE_SASL virNetSASLSessionPtr sasl; +# endif /* This is only valid if a remote open call has been made on this * connection, otherwise it will be NULL. Also if remote close is @@ -81,7 +85,9 @@ struct daemonClientPrivate { daemonClientStreamPtr streams; }; +# if HAVE_SASL extern virNetSASLContextPtr saslCtxt; +# endif extern virNetServerProgramPtr remoteProgram; extern virNetServerProgramPtr qemuProgram; -- 1.7.5.4

3 3

[libvirt] [PATCH 0/4] Virsh: Extend command arguments completion
by Michal Privoznik 05 Jul '11

05 Jul '11

This patchset extends arguments completion for virsh commands. Currently only for domain related (start, destroy, etc.) and 'help'. But if community is satisfied with this little part I'll write follow up patches for other commands as well. This means that for command start not only pre-defined options will be generated (autodestroy, console, paused) but names of inactive domains too. However, this requires virsh to be already connected to daemon. Completers for commands can be easily defined as they follow readline logic. Basically, completer returns on each call one string (=possible argument/option) and it's called repeatedly until NULL is returned. To generate only corresponding values for given prefix, there is @text variable in function prototype. There is also @state variable that is set to zero on the 1st call and to non-zero on any subsequent calls, so completer can set it internal structures. Michal Privoznik (4): virsh: make conn global virsh: Extend virsh commands definition with completer virsh: Create completer for commands related to domains virsh: Create completer for help command tools/virsh.c | 1108 ++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 660 insertions(+), 448 deletions(-) -- 1.7.5.rc3

2 8