diff mbox

configure: Rename CONFIG_QGA_NTDDDISK into CONFIG_QGA_NTDDSCSI

Message ID 1465572354-3083-1-git-send-email-thuth@redhat.com
State New
Headers show

Commit Message

Thomas Huth June 10, 2016, 3:25 p.m. UTC
There is no CONFIG_QGA_NTDDDISK define used anywhere in the QEMU
sources. Looking at the changelog and qga/commands-win32.c, it
seems like this should be called CONFIG_QGA_NTDDSCSI instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Roth June 10, 2016, 5:47 p.m. UTC | #1
Quoting Thomas Huth (2016-06-10 10:25:54)
> There is no CONFIG_QGA_NTDDDISK define used anywhere in the QEMU
> sources. Looking at the changelog and qga/commands-win32.c, it
> seems like this should be called CONFIG_QGA_NTDDSCSI instead.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Yikes, this does appear to be the case. Need to recheck the original
functionality since apparently it's been disabled ever since I added
this patch to the original series, but can take this in through my
tree.

Cc'ing qemu-stable

> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 8c2f90b..55019d6 100755
> --- a/configure
> +++ b/configure
> @@ -4965,7 +4965,7 @@ if test "$mingw32" = "yes" ; then
>      echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
>    fi
>    if test "$guest_agent_ntddscsi" = "yes" ; then
> -    echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak
> +    echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
>    fi
>    if test "$guest_agent_msi" = "yes"; then
>      echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak  
> -- 
> 1.8.3.1
>
Michael Roth June 30, 2016, 7:04 p.m. UTC | #2
Quoting Thomas Huth (2016-06-10 10:25:54)
> There is no CONFIG_QGA_NTDDDISK define used anywhere in the QEMU
> sources. Looking at the changelog and qga/commands-win32.c, it
> seems like this should be called CONFIG_QGA_NTDDSCSI instead.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Thanks, applied to qga tree:
  https://github.com/mdroth/qemu/commits/qga

Although this did indeed uncover a bug in guest-get-fsinfo.
Should have a fix soon, but will want that in place before
I send a pull.

> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 8c2f90b..55019d6 100755
> --- a/configure
> +++ b/configure
> @@ -4965,7 +4965,7 @@ if test "$mingw32" = "yes" ; then
>      echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
>    fi
>    if test "$guest_agent_ntddscsi" = "yes" ; then
> -    echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak
> +    echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
>    fi
>    if test "$guest_agent_msi" = "yes"; then
>      echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak  
> -- 
> 1.8.3.1
>
Michael Roth July 21, 2016, 11:19 p.m. UTC | #3
Quoting Michael Roth (2016-06-30 14:04:15)
> Quoting Thomas Huth (2016-06-10 10:25:54)
> > There is no CONFIG_QGA_NTDDDISK define used anywhere in the QEMU
> > sources. Looking at the changelog and qga/commands-win32.c, it
> > seems like this should be called CONFIG_QGA_NTDDSCSI instead.
> > 
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> 
> Thanks, applied to qga tree:
>   https://github.com/mdroth/qemu/commits/qga
> 
> Although this did indeed uncover a bug in guest-get-fsinfo.
> Should have a fix soon, but will want that in place before
> I send a pull.

So, that fix turned into a fairly heavy rework of how we map
PCI devices to filesystems in the current w32 implementation
of guest-get-fsinfo and I still don't quite have it working.
It probably won't make 2.7 at this point.

Unfortunately, as things stand, enabling the disk info
support on w32 via your patch causes the entire command to
fail, which would be a regression from the current support
level.

So for now I think the most expedient thing to do would be
to hold off on this patch till 2.8, at which point we can
apply it along with the disk info fixes I'm working on.

> 
> > ---
> >  configure | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/configure b/configure
> > index 8c2f90b..55019d6 100755
> > --- a/configure
> > +++ b/configure
> > @@ -4965,7 +4965,7 @@ if test "$mingw32" = "yes" ; then
> >      echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
> >    fi
> >    if test "$guest_agent_ntddscsi" = "yes" ; then
> > -    echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak
> > +    echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
> >    fi
> >    if test "$guest_agent_msi" = "yes"; then
> >      echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak  
> > -- 
> > 1.8.3.1
> > 
> 
>
diff mbox

Patch

diff --git a/configure b/configure
index 8c2f90b..55019d6 100755
--- a/configure
+++ b/configure
@@ -4965,7 +4965,7 @@  if test "$mingw32" = "yes" ; then
     echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
   fi
   if test "$guest_agent_ntddscsi" = "yes" ; then
-    echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak
+    echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
   fi
   if test "$guest_agent_msi" = "yes"; then
     echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak