| Message ID | 1437381803-2936-1-git-send-email-fziglio@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Jul 20, 2015 at 09:43:23AM +0100, Frediano Ziglio wrote: > The new spice-server function to limit the number of monitors (0.12.6) > changed while development from spice_qxl_set_monitors_config_limit to > spice_qxl_max_monitors (accepted upstream). > By mistake I post patch with former name. > This patch fix the function name. > > Signed-off-by: Frediano Ziglio <fziglio@redhat.com> > > --- > hw/display/qxl.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > I tested again doing a clean build, unfortunately I did some mistake > and my tests worked. > > diff --git a/hw/display/qxl.c b/hw/display/qxl.c > index 4e5ff69..2288238 100644 > --- a/hw/display/qxl.c > +++ b/hw/display/qxl.c > @@ -273,8 +273,7 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) > } else { > #if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */ > if (qxl->max_outputs) { > - spice_qxl_set_monitors_config_limit(&qxl->ssd.qxl, > - qxl->max_outputs); > + spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs); > } > #endif > qxl->guest_monitors_config = qxl->ram->monitors_config; ACK from me, Christophe
On Mon, Jul 20, 2015 at 09:43:23AM +0100, Frediano Ziglio wrote: >The new spice-server function to limit the number of monitors (0.12.6) >changed while development from spice_qxl_set_monitors_config_limit to >spice_qxl_max_monitors (accepted upstream). >By mistake I post patch with former name. >This patch fix the function name. > >Signed-off-by: Frediano Ziglio <fziglio@redhat.com> > >--- > hw/display/qxl.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > >I tested again doing a clean build, unfortunately I did some mistake >and my tests worked. > >diff --git a/hw/display/qxl.c b/hw/display/qxl.c >index 4e5ff69..2288238 100644 >--- a/hw/display/qxl.c >+++ b/hw/display/qxl.c >@@ -273,8 +273,7 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) > } else { > #if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */ > if (qxl->max_outputs) { >- spice_qxl_set_monitors_config_limit(&qxl->ssd.qxl, >- qxl->max_outputs); >+ spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs); > } > #endif > qxl->guest_monitors_config = qxl->ram->monitors_config; >-- >2.1.0 > Same as the fix I did in order for this to work with upstream spice. ACK. Weak, though, as I'm not a privileged one. Martin
Hi On Mon, Jul 20, 2015 at 11:46 AM, Martin Kletzander <mkletzan@redhat.com> wrote: > On Mon, Jul 20, 2015 at 09:43:23AM +0100, Frediano Ziglio wrote: >> >> The new spice-server function to limit the number of monitors (0.12.6) >> changed while development from spice_qxl_set_monitors_config_limit to >> spice_qxl_max_monitors (accepted upstream). >> By mistake I post patch with former name. >> This patch fix the function name. >> >> Signed-off-by: Frediano Ziglio <fziglio@redhat.com> >> ACK, I'll try sending a proper pull request for 2.4 since Gerd is on holidays >> --- >> hw/display/qxl.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> I tested again doing a clean build, unfortunately I did some mistake >> and my tests worked. >> >> diff --git a/hw/display/qxl.c b/hw/display/qxl.c >> index 4e5ff69..2288238 100644 >> --- a/hw/display/qxl.c >> +++ b/hw/display/qxl.c >> @@ -273,8 +273,7 @@ static void >> qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) >> } else { >> #if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */ >> if (qxl->max_outputs) { >> - spice_qxl_set_monitors_config_limit(&qxl->ssd.qxl, >> - qxl->max_outputs); >> + spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs); >> } >> #endif >> qxl->guest_monitors_config = qxl->ram->monitors_config; >> -- >> 2.1.0 H>> > > Same as the fix I did in order for this to work with upstream spice. > > ACK. Weak, though, as I'm not a privileged one. > > Martin > > _______________________________________________ > Spice-devel mailing list > Spice-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/spice-devel >
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 4e5ff69..2288238 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -273,8 +273,7 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) } else { #if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */ if (qxl->max_outputs) { - spice_qxl_set_monitors_config_limit(&qxl->ssd.qxl, - qxl->max_outputs); + spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs); } #endif qxl->guest_monitors_config = qxl->ram->monitors_config;
The new spice-server function to limit the number of monitors (0.12.6) changed while development from spice_qxl_set_monitors_config_limit to spice_qxl_max_monitors (accepted upstream). By mistake I post patch with former name. This patch fix the function name. Signed-off-by: Frediano Ziglio <fziglio@redhat.com> --- hw/display/qxl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) I tested again doing a clean build, unfortunately I did some mistake and my tests worked.