XenbusStateReconfiguring/XenbusStateReconfigured were introduced by c/s
437, but aren't handled in many switch statements. This c/s also
introduced a possibly un-referenced label, which also gets eliminated
here.
As usual, written and tested on 2.6.25-rc3 and made apply to the 2.6.18
tree without further testing.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Index: head-2008-02-26/drivers/char/tpm/tpm_xen.c
===================================================================
--- head-2008-02-26.orig/drivers/char/tpm/tpm_xen.c 2008-02-26
17:46:36.000000000 +0100
+++ head-2008-02-26/drivers/char/tpm/tpm_xen.c 2008-03-05 12:34:15.000000000
+0100
@@ -346,6 +346,8 @@ static void backend_changed(struct xenbu
case XenbusStateInitialising:
case XenbusStateInitWait:
case XenbusStateInitialised:
+ case XenbusStateReconfiguring:
+ case XenbusStateReconfigured:
case XenbusStateUnknown:
break;
Index: head-2008-02-26/drivers/xen/blkfront/blkfront.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/blkfront/blkfront.c 2008-03-05
12:33:07.000000000 +0100
+++ head-2008-02-26/drivers/xen/blkfront/blkfront.c 2008-03-04
15:13:17.000000000 +0100
@@ -266,6 +266,8 @@ static void backend_changed(struct xenbu
case XenbusStateInitialising:
case XenbusStateInitWait:
case XenbusStateInitialised:
+ case XenbusStateReconfiguring:
+ case XenbusStateReconfigured:
case XenbusStateUnknown:
case XenbusStateClosed:
break;
Index: head-2008-02-26/drivers/xen/fbfront/xenfb.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/fbfront/xenfb.c 2008-03-05
12:33:07.000000000 +0100
+++ head-2008-02-26/drivers/xen/fbfront/xenfb.c 2008-03-04 15:47:06.000000000
+0100
@@ -687,6 +687,8 @@ static void xenfb_backend_changed(struct
switch (backend_state) {
case XenbusStateInitialising:
case XenbusStateInitialised:
+ case XenbusStateReconfiguring:
+ case XenbusStateReconfigured:
case XenbusStateUnknown:
case XenbusStateClosed:
break;
Index: head-2008-02-26/drivers/xen/fbfront/xenkbd.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/fbfront/xenkbd.c 2008-03-05
12:33:07.000000000 +0100
+++ head-2008-02-26/drivers/xen/fbfront/xenkbd.c 2008-03-04
15:47:19.000000000 +0100
@@ -268,6 +268,8 @@ static void xenkbd_backend_changed(struc
switch (backend_state) {
case XenbusStateInitialising:
case XenbusStateInitialised:
+ case XenbusStateReconfiguring:
+ case XenbusStateReconfigured:
case XenbusStateUnknown:
case XenbusStateClosed:
break;
Index: head-2008-02-26/drivers/xen/netfront/netfront.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/netfront/netfront.c 2008-03-05
12:33:07.000000000 +0100
+++ head-2008-02-26/drivers/xen/netfront/netfront.c 2008-03-04
15:48:01.000000000 +0100
@@ -537,6 +537,8 @@ static void backend_changed(struct xenbu
case XenbusStateInitialising:
case XenbusStateInitialised:
case XenbusStateConnected:
+ case XenbusStateReconfiguring:
+ case XenbusStateReconfigured:
case XenbusStateUnknown:
case XenbusStateClosed:
break;
Index: head-2008-02-26/drivers/xen/pcifront/pci_op.c
===================================================================
--- head-2008-02-26.orig/drivers/xen/pcifront/pci_op.c 2008-03-05
12:33:07.000000000 +0100
+++ head-2008-02-26/drivers/xen/pcifront/pci_op.c 2008-03-04
15:46:05.000000000 +0100
@@ -359,7 +359,6 @@ int pcifront_rescan_root(struct pcifront
struct pci_bus *b;
struct pci_dev *d;
unsigned int devfn;
- int err = 0;
#ifndef CONFIG_PCI_DOMAINS
if (domain != 0) {
@@ -367,8 +366,7 @@ int pcifront_rescan_root(struct pcifront
"PCI Root in non-zero PCI Domain! domain=%d\n", domain);
dev_err(&pdev->xdev->dev,
"Please compile with CONFIG_PCI_DOMAINS\n");
- err = -EINVAL;
- goto err_out;
+ return -EINVAL;
}
#endif
@@ -407,8 +405,7 @@ int pcifront_rescan_root(struct pcifront
}
}
- err_out:
- return err;
+ return 0;
}
static void free_root_bus_devs(struct pci_bus *bus)
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home