mirror of https://gitee.com/openkylin/libvirt.git
Fix gcc 4.6 warnings
gcc 4.6 warns when a variable is initialized but isn't used afterwards: vmware/vmware_driver.c:449:18: warning: variable 'vmxPath' set but not used [-Wunused-but-set-variable] This patch fixes these warnings. There are still 2 offending files: - vbox_tmpl.c: the variable is used inside an #ifdef and is assigned several times outside of #ifdef. Fixing the warning would have required wrapping all the assignment inside #ifdef which hurts readability. vbox/vbox_tmpl.c: In function 'vboxAttachDrives': vbox/vbox_tmpl.c:3918:22: warning: variable 'accessMode' set but not used [-Wunused-but-set-variable] - esx_vi_types.generated.c: the name implies it's generated code and I didn't want to dive into the code generator esx/esx_vi_types.generated.c: In function 'esxVI_FileQueryFlags_Free': esx/esx_vi_types.generated.c:1203:3: warning: variable 'item' set but not used [-Wunused-but-set-variable]
This commit is contained in:
parent
2ac455c4d2
commit
454e50beee
1
.mailmap
1
.mailmap
|
@ -14,3 +14,4 @@
|
|||
<jclift@redhat.com> <justin@salasaga.org>
|
||||
<berrange@redhat.com> <dan@berrange.com>
|
||||
<soren@linux2go.dk> <soren@canonical.com>
|
||||
<cfergeau@redhat.com> <teuf@gnome.org>
|
||||
|
|
2
AUTHORS
2
AUTHORS
|
@ -156,7 +156,7 @@ Patches have also been contributed by:
|
|||
Zdenek Styblik <stybla@turnovfree.net>
|
||||
Gui Jianfeng <guijianfeng@cn.fujitsu.com>
|
||||
Michal Novotny <minovotn@redhat.com>
|
||||
Christophe Fergeau <teuf@gnome.org>
|
||||
Christophe Fergeau <cfergeau@redhat.com>
|
||||
Markus Groß <gross@univention.de>
|
||||
Phil Petty <phpetty@cisco.com>
|
||||
Taku Izumi <izumi.taku@jp.fujitsu.com>
|
||||
|
|
|
@ -1634,7 +1634,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter,
|
|||
bool isIPv6)
|
||||
{
|
||||
int rc;
|
||||
int directionIn = 0, directionOut = 0;
|
||||
int directionIn = 0;
|
||||
char chainPrefix[2];
|
||||
bool maySkipICMP, inout = false;
|
||||
char *matchState = NULL;
|
||||
|
@ -1643,9 +1643,8 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter,
|
|||
if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) ||
|
||||
(rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) {
|
||||
directionIn = 1;
|
||||
directionOut = inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
|
||||
} else
|
||||
directionOut = 1;
|
||||
inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
|
||||
}
|
||||
|
||||
chainPrefix[0] = 'F';
|
||||
|
||||
|
|
|
@ -389,7 +389,7 @@ static void virLogDumpAllFD(const char *msg, int len) {
|
|||
void
|
||||
virLogEmergencyDumpAll(int signum) {
|
||||
int len;
|
||||
int oldLogStart, oldLogLen, oldLogEnd;
|
||||
int oldLogStart, oldLogLen;
|
||||
|
||||
switch (signum) {
|
||||
#ifdef SIGFPE
|
||||
|
@ -444,7 +444,6 @@ virLogEmergencyDumpAll(int signum) {
|
|||
* so it's best to reset it first.
|
||||
*/
|
||||
oldLogStart = virLogStart;
|
||||
oldLogEnd = virLogEnd;
|
||||
oldLogLen = virLogLen;
|
||||
virLogEnd = 0;
|
||||
virLogLen = 0;
|
||||
|
|
|
@ -467,7 +467,7 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED)
|
|||
}
|
||||
|
||||
vmwareSetSentinal(cmd, vmw_types[driver->type]);
|
||||
vmwareSetSentinal(cmd, ((vmwareDomainPtr) vm->privateData)->vmxPath);
|
||||
vmwareSetSentinal(cmd, vmxPath);
|
||||
|
||||
|
||||
if (vm->state != VIR_DOMAIN_RUNNING) {
|
||||
|
|
Loading…
Reference in New Issue