* [PATCH] hw/i386/xen: Remove dead code
@ 2021-02-02 15:56 Philippe Mathieu-Daudé
2021-02-02 16:05 ` Paul Durrant
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-02-02 15:56 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Paolo Bonzini, Eduardo Habkost, qemu-trivial,
Michael S. Tsirkin, Marcel Apfelbaum, xen-devel, Paul Durrant,
Anthony Perard, Stefano Stabellini, Philippe Mathieu-Daudé
'drivers_blacklisted' is never accessed, remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/i386/xen/xen_platform.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 7c4db35debb..01ae1fb1618 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -60,7 +60,6 @@ struct PCIXenPlatformState {
MemoryRegion bar;
MemoryRegion mmio_bar;
uint8_t flags; /* used only for version_id == 2 */
- int drivers_blacklisted;
uint16_t driver_product_version;
/* Log from guest drivers */
@@ -245,18 +244,10 @@ static void platform_fixed_ioport_writeb(void *opaque, uint32_t addr, uint32_t v
static uint32_t platform_fixed_ioport_readw(void *opaque, uint32_t addr)
{
- PCIXenPlatformState *s = opaque;
-
switch (addr) {
case 0:
- if (s->drivers_blacklisted) {
- /* The drivers will recognise this magic number and refuse
- * to do anything. */
- return 0xd249;
- } else {
- /* Magic value so that you can identify the interface. */
- return 0x49d2;
- }
+ /* Magic value so that you can identify the interface. */
+ return 0x49d2;
default:
return 0xffff;
}
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] hw/i386/xen: Remove dead code
2021-02-02 15:56 [PATCH] hw/i386/xen: Remove dead code Philippe Mathieu-Daudé
@ 2021-02-02 16:05 ` Paul Durrant
2021-02-02 16:39 ` Paolo Bonzini
2021-02-13 22:37 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Paul Durrant @ 2021-02-02 16:05 UTC (permalink / raw)
To: 'Philippe Mathieu-Daudé', qemu-devel
Cc: 'Richard Henderson', 'Paolo Bonzini',
'Eduardo Habkost',
qemu-trivial, 'Michael S. Tsirkin',
'Marcel Apfelbaum', xen-devel, 'Anthony Perard',
'Stefano Stabellini'
> -----Original Message-----
> From: Philippe Mathieu-Daudé <philmd@redhat.com>
> Sent: 02 February 2021 15:57
> To: qemu-devel@nongnu.org
> Cc: Richard Henderson <richard.henderson@linaro.org>; Paolo Bonzini <pbonzini@redhat.com>; Eduardo
> Habkost <ehabkost@redhat.com>; qemu-trivial@nongnu.org; Michael S. Tsirkin <mst@redhat.com>; Marcel
> Apfelbaum <marcel.apfelbaum@gmail.com>; xen-devel@lists.xenproject.org; Paul Durrant <paul@xen.org>;
> Anthony Perard <anthony.perard@citrix.com>; Stefano Stabellini <sstabellini@kernel.org>; Philippe
> Mathieu-Daudé <philmd@redhat.com>
> Subject: [PATCH] hw/i386/xen: Remove dead code
>
> 'drivers_blacklisted' is never accessed, remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
FTR this is a vestige of an ancient mechanism that's not used any more (see https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/misc/hvm-emulated-unplug.pandoc step 5).
Reviewed-by: Paul Durrant <paul@xen.org>
> ---
> hw/i386/xen/xen_platform.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
> index 7c4db35debb..01ae1fb1618 100644
> --- a/hw/i386/xen/xen_platform.c
> +++ b/hw/i386/xen/xen_platform.c
> @@ -60,7 +60,6 @@ struct PCIXenPlatformState {
> MemoryRegion bar;
> MemoryRegion mmio_bar;
> uint8_t flags; /* used only for version_id == 2 */
> - int drivers_blacklisted;
> uint16_t driver_product_version;
>
> /* Log from guest drivers */
> @@ -245,18 +244,10 @@ static void platform_fixed_ioport_writeb(void *opaque, uint32_t addr, uint32_t v
>
> static uint32_t platform_fixed_ioport_readw(void *opaque, uint32_t addr)
> {
> - PCIXenPlatformState *s = opaque;
> -
> switch (addr) {
> case 0:
> - if (s->drivers_blacklisted) {
> - /* The drivers will recognise this magic number and refuse
> - * to do anything. */
> - return 0xd249;
> - } else {
> - /* Magic value so that you can identify the interface. */
> - return 0x49d2;
> - }
> + /* Magic value so that you can identify the interface. */
> + return 0x49d2;
> default:
> return 0xffff;
> }
> --
> 2.26.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/i386/xen: Remove dead code
2021-02-02 15:56 [PATCH] hw/i386/xen: Remove dead code Philippe Mathieu-Daudé
2021-02-02 16:05 ` Paul Durrant
@ 2021-02-02 16:39 ` Paolo Bonzini
2021-02-13 22:37 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2021-02-02 16:39 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Richard Henderson, Eduardo Habkost, qemu-trivial,
Michael S. Tsirkin, Marcel Apfelbaum, xen-devel, Paul Durrant,
Anthony Perard, Stefano Stabellini, qemu-trivial
On 02/02/21 16:56, Philippe Mathieu-Daudé wrote:
> 'drivers_blacklisted' is never accessed, remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/i386/xen/xen_platform.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
> index 7c4db35debb..01ae1fb1618 100644
> --- a/hw/i386/xen/xen_platform.c
> +++ b/hw/i386/xen/xen_platform.c
> @@ -60,7 +60,6 @@ struct PCIXenPlatformState {
> MemoryRegion bar;
> MemoryRegion mmio_bar;
> uint8_t flags; /* used only for version_id == 2 */
> - int drivers_blacklisted;
> uint16_t driver_product_version;
>
> /* Log from guest drivers */
> @@ -245,18 +244,10 @@ static void platform_fixed_ioport_writeb(void *opaque, uint32_t addr, uint32_t v
>
> static uint32_t platform_fixed_ioport_readw(void *opaque, uint32_t addr)
> {
> - PCIXenPlatformState *s = opaque;
> -
> switch (addr) {
> case 0:
> - if (s->drivers_blacklisted) {
> - /* The drivers will recognise this magic number and refuse
> - * to do anything. */
> - return 0xd249;
> - } else {
> - /* Magic value so that you can identify the interface. */
> - return 0x49d2;
> - }
> + /* Magic value so that you can identify the interface. */
> + return 0x49d2;
> default:
> return 0xffff;
> }
>
Cc: qemu-trivial@nongnu.org
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/i386/xen: Remove dead code
2021-02-02 15:56 [PATCH] hw/i386/xen: Remove dead code Philippe Mathieu-Daudé
2021-02-02 16:05 ` Paul Durrant
2021-02-02 16:39 ` Paolo Bonzini
@ 2021-02-13 22:37 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2021-02-13 22:37 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Stefano Stabellini, Eduardo Habkost, Michael S. Tsirkin,
qemu-trivial, Paul Durrant, Richard Henderson, Marcel Apfelbaum,
xen-devel, Anthony Perard, Paolo Bonzini
Le 02/02/2021 à 16:56, Philippe Mathieu-Daudé a écrit :
> 'drivers_blacklisted' is never accessed, remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/i386/xen/xen_platform.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
> index 7c4db35debb..01ae1fb1618 100644
> --- a/hw/i386/xen/xen_platform.c
> +++ b/hw/i386/xen/xen_platform.c
> @@ -60,7 +60,6 @@ struct PCIXenPlatformState {
> MemoryRegion bar;
> MemoryRegion mmio_bar;
> uint8_t flags; /* used only for version_id == 2 */
> - int drivers_blacklisted;
> uint16_t driver_product_version;
>
> /* Log from guest drivers */
> @@ -245,18 +244,10 @@ static void platform_fixed_ioport_writeb(void *opaque, uint32_t addr, uint32_t v
>
> static uint32_t platform_fixed_ioport_readw(void *opaque, uint32_t addr)
> {
> - PCIXenPlatformState *s = opaque;
> -
> switch (addr) {
> case 0:
> - if (s->drivers_blacklisted) {
> - /* The drivers will recognise this magic number and refuse
> - * to do anything. */
> - return 0xd249;
> - } else {
> - /* Magic value so that you can identify the interface. */
> - return 0x49d2;
> - }
> + /* Magic value so that you can identify the interface. */
> + return 0x49d2;
> default:
> return 0xffff;
> }
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-13 22:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02 15:56 [PATCH] hw/i386/xen: Remove dead code Philippe Mathieu-Daudé
2021-02-02 16:05 ` Paul Durrant
2021-02-02 16:39 ` Paolo Bonzini
2021-02-13 22:37 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).