[libvirt] [PATCH] Add dummy nwfilter driver to test driver

This patch adds a dummy nwfilter driver to the test driver so that the int-overflow test passes without modifications. Signed-off-by: Stefan Berger <Stefanb@us.ibm.com> Index: libvirt/src/test/test_driver.c =================================================================== --- libvirt.orig/src/test/test_driver.c +++ libvirt/src/test/test_driver.c @@ -5205,6 +5205,22 @@ static int testSecretClose(virConnectPtr return 0; } + +static virDrvOpenStatus testNWFilterOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) { + if (STRNEQ(conn->driver->name, "Test")) + return VIR_DRV_OPEN_DECLINED; + + conn->secretPrivateData = conn->privateData; + return VIR_DRV_OPEN_SUCCESS; +} + +static int testNWFilterClose(virConnectPtr conn) { + conn->nwfilterPrivateData = NULL; + return 0; +} + static virDriver testDriver = { VIR_DRV_TEST, "Test", @@ -5398,6 +5414,12 @@ static virSecretDriver testSecretDriver }; +static virNWFilterDriver testNWFilterDriver = { + .name = "Test", + .open = testNWFilterOpen, + .close = testNWFilterClose, +}; + /** * testRegister: * @@ -5418,6 +5440,8 @@ testRegister(void) return -1; if (virRegisterSecretDriver(&testSecretDriver) < 0) return -1; + if (virRegisterNWFilterDriver(&testNWFilterDriver) < 0) + return -1; return 0; }

On Mon, Mar 29, 2010 at 04:08:35PM -0400, Stefan Berger wrote:
This patch adds a dummy nwfilter driver to the test driver so that the int-overflow test passes without modifications.
Signed-off-by: Stefan Berger <Stefanb@us.ibm.com>
ACK, that's the right fix :-) please push ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2010/3/29 Stefan Berger <stefanb@us.ibm.com>:
This patch adds a dummy nwfilter driver to the test driver so that the int-overflow test passes without modifications.
Signed-off-by: Stefan Berger <Stefanb@us.ibm.com>
Index: libvirt/src/test/test_driver.c =================================================================== --- libvirt.orig/src/test/test_driver.c +++ libvirt/src/test/test_driver.c @@ -5205,6 +5205,22 @@ static int testSecretClose(virConnectPtr return 0; }
+ +static virDrvOpenStatus testNWFilterOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) { + if (STRNEQ(conn->driver->name, "Test")) + return VIR_DRV_OPEN_DECLINED; + + conn->secretPrivateData = conn->privateData;
Shouldn't nwfilterPrivateData be used here instead of secretPrivateData?
+ return VIR_DRV_OPEN_SUCCESS; +} + +static int testNWFilterClose(virConnectPtr conn) { + conn->nwfilterPrivateData = NULL; + return 0; +} +
Matthias

On Tue, Mar 30, 2010 at 04:02:53PM +0100, Matthias Bolte wrote:
2010/3/29 Stefan Berger <stefanb@us.ibm.com>:
This patch adds a dummy nwfilter driver to the test driver so that the int-overflow test passes without modifications.
Signed-off-by: Stefan Berger <Stefanb@us.ibm.com>
Index: libvirt/src/test/test_driver.c =================================================================== --- libvirt.orig/src/test/test_driver.c +++ libvirt/src/test/test_driver.c @@ -5205,6 +5205,22 @@ static int testSecretClose(virConnectPtr return 0; }
+ +static virDrvOpenStatus testNWFilterOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) { + if (STRNEQ(conn->driver->name, "Test")) + return VIR_DRV_OPEN_DECLINED; + + conn->secretPrivateData = conn->privateData;
Shouldn't nwfilterPrivateData be used here instead of secretPrivateData?
Yes, though in this case it has no effect :-) Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

Matthias Bolte <matthias.bolte@googlemail.com> wrote on 03/30/2010 11:02:53 AM:
2010/3/29 Stefan Berger <stefanb@us.ibm.com>:
This patch adds a dummy nwfilter driver to the test driver so that the int-overflow test passes without modifications.
Signed-off-by: Stefan Berger <Stefanb@us.ibm.com>
Index: libvirt/src/test/test_driver.c =================================================================== --- libvirt.orig/src/test/test_driver.c +++ libvirt/src/test/test_driver.c @@ -5205,6 +5205,22 @@ static int testSecretClose(virConnectPtr return 0; }
+ +static virDrvOpenStatus testNWFilterOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED)
{
+ if (STRNEQ(conn->driver->name, "Test")) + return VIR_DRV_OPEN_DECLINED; + + conn->secretPrivateData = conn->privateData;
Shouldn't nwfilterPrivateData be used here instead of secretPrivateData?
True. Will fix. Stefan
participants (4)
-
Daniel P. Berrange
-
Daniel Veillard
-
Matthias Bolte
-
Stefan Berger